| Message ID | 6E3BC7F7C9A4BF4286DD4C043110F30B59E04001D4@shsmsx502.ccr.corp.intel.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Fri, Jul 08, 2011 at 02:24:31PM +0800, Liu, ShuoX wrote: > From b260c4e51487364552886b0327fe98d66e850168 Mon Sep 17 00:00:00 2001 > From: ShuoX Liu <shuox.liu@intel.com> > Date: Thu, 7 Jul 2011 16:09:41 +0800 > Subject: [PATCH] dw_spi: Add spi number into spi irq desc > > Signed-off-by: ShuoX Liu <shuox.liu@intel.com> Patch does not apply against current spi/next (linux-next). g. > --- > drivers/spi/dw_spi.c | 4 +++- > drivers/spi/dw_spi.h | 1 + > 2 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c > index 919fa9d..68a3026 100644 > --- a/drivers/spi/dw_spi.c > +++ b/drivers/spi/dw_spi.c > @@ -818,9 +818,11 @@ int __devinit dw_spi_add_host(struct dw_spi *dws) > dws->prev_chip = NULL; > dws->dma_inited = 0; > dws->dma_addr = (dma_addr_t)(dws->paddr + 0x60); > + snprintf(dws->name, sizeof(dws->name), "dw_spi%d", > + dws->bus_num); > > ret = request_irq(dws->irq, dw_spi_irq, IRQF_SHARED, > - "dw_spi", dws); > + dws->name, dws); > if (ret < 0) { > dev_err(&master->dev, "can not get IRQ\n"); > goto err_free_master; > diff --git a/drivers/spi/dw_spi.h b/drivers/spi/dw_spi.h > index 7a5e78d..8b7b07b 100644 > --- a/drivers/spi/dw_spi.h > +++ b/drivers/spi/dw_spi.h > @@ -96,6 +96,7 @@ struct dw_spi { > struct spi_device *cur_dev; > struct device *parent_dev; > enum dw_ssi_type type; > + char name[16]; > > void __iomem *regs; > unsigned long paddr; > -- > 1.7.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ ------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2
On Fri, Jul 08, 2011 at 02:24:31PM +0800, Liu, ShuoX wrote: > From b260c4e51487364552886b0327fe98d66e850168 Mon Sep 17 00:00:00 2001 > From: ShuoX Liu <shuox.liu@intel.com> > Date: Thu, 7 Jul 2011 16:09:41 +0800 > Subject: [PATCH] dw_spi: Add spi number into spi irq desc > > Signed-off-by: ShuoX Liu <shuox.liu@intel.com> Actually, the problem was just the files were renamed. Applied, thanks. g. > --- > drivers/spi/dw_spi.c | 4 +++- > drivers/spi/dw_spi.h | 1 + > 2 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c > index 919fa9d..68a3026 100644 > --- a/drivers/spi/dw_spi.c > +++ b/drivers/spi/dw_spi.c > @@ -818,9 +818,11 @@ int __devinit dw_spi_add_host(struct dw_spi *dws) > dws->prev_chip = NULL; > dws->dma_inited = 0; > dws->dma_addr = (dma_addr_t)(dws->paddr + 0x60); > + snprintf(dws->name, sizeof(dws->name), "dw_spi%d", > + dws->bus_num); > > ret = request_irq(dws->irq, dw_spi_irq, IRQF_SHARED, > - "dw_spi", dws); > + dws->name, dws); > if (ret < 0) { > dev_err(&master->dev, "can not get IRQ\n"); > goto err_free_master; > diff --git a/drivers/spi/dw_spi.h b/drivers/spi/dw_spi.h > index 7a5e78d..8b7b07b 100644 > --- a/drivers/spi/dw_spi.h > +++ b/drivers/spi/dw_spi.h > @@ -96,6 +96,7 @@ struct dw_spi { > struct spi_device *cur_dev; > struct device *parent_dev; > enum dw_ssi_type type; > + char name[16]; > > void __iomem *regs; > unsigned long paddr; > -- > 1.7.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ ------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2
diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c index 919fa9d..68a3026 100644 --- a/drivers/spi/dw_spi.c +++ b/drivers/spi/dw_spi.c @@ -818,9 +818,11 @@ int __devinit dw_spi_add_host(struct dw_spi *dws) dws->prev_chip = NULL; dws->dma_inited = 0; dws->dma_addr = (dma_addr_t)(dws->paddr + 0x60); + snprintf(dws->name, sizeof(dws->name), "dw_spi%d", + dws->bus_num); ret = request_irq(dws->irq, dw_spi_irq, IRQF_SHARED, - "dw_spi", dws); + dws->name, dws); if (ret < 0) { dev_err(&master->dev, "can not get IRQ\n"); goto err_free_master; diff --git a/drivers/spi/dw_spi.h b/drivers/spi/dw_spi.h index 7a5e78d..8b7b07b 100644 --- a/drivers/spi/dw_spi.h +++ b/drivers/spi/dw_spi.h @@ -96,6 +96,7 @@ struct dw_spi { struct spi_device *cur_dev; struct device *parent_dev; enum dw_ssi_type type; + char name[16]; void __iomem *regs; unsigned long paddr;