spi/dw: Add spi number into spi irq desc

Signed-off-by: ShuoX Liu <shuox.liu@intel.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
index ece5f69deaaf1bff5963ee52322aa37afd9f670d..857cd30b44bbb7016d549df6767fe4329dec9e53 100644 (file)
--- a/drivers/spi/spi-dw.c
+++ b/drivers/spi/spi-dw.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/spi-dw.h b/drivers/spi/spi-dw.h
index 7a5e78d2a5cb98c1de9c04fbde849885e643dd4e..8b7b07bf6c3f06580a8d26c5363e75a6738fa903 100644 (file)
--- a/drivers/spi/spi-dw.h
+++ b/drivers/spi/spi-dw.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;