[PATCH] pcmcia: add pcmcia to IRQ information

Add a devname parameter to the pcmcia_device structure, fills it with
"pcmcia<bus_id>" in pcmcia_device_add, and passes it to request_irq in
pcmcia_request_irq.

Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index deb6d00bc2ff..89022ad5b520 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -820,7 +820,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
                                           ((req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) ||
                                            (s->functions > 1) ||
                                            (irq == s->pci_irq)) ? SA_SHIRQ : 0,
-                                          p_dev->dev.bus_id,
+                                          p_dev->devname,
                                           (req->Attributes & IRQ_HANDLE_PRESENT) ? req->Instance : data);
                         if (!ret) {
                                 if (!(req->Attributes & IRQ_HANDLE_PRESENT))
@@ -842,7 +842,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
                                 ((req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) ||
                                  (s->functions > 1) ||
                                  (irq == s->pci_irq)) ? SA_SHIRQ : 0,
-                                p_dev->dev.bus_id, req->Instance))
+                                p_dev->devname, req->Instance))
                         return CS_IN_USE;
         }