staging: comedi: ni_6527: remove DRIVER_NAME define

The request_irq() call should be using dev->board_name to better
identify the irq user.

Remove the DRIVER_NAME define and just open code the 'driver_name' in
the comedi_driver and the 'name' in the pci_driver declarations.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index 44557c9671ace9b1050010e5b59bbb517484ee7b..f3ff329847b6824864bd236739028e53dfc5e67a 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -45,8 +45,6 @@ Updated: Sat, 25 Jan 2003 13:24:40 -0800
 #include "comedi_fc.h"
 #include "mite.h"
 
-#define DRIVER_NAME "ni_6527"
-
 #define NI6527_DIO_SIZE 4096
 #define NI6527_MITE_SIZE 4096
 
@@ -396,7 +394,7 @@ static int ni6527_auto_attach(struct comedi_device *dev,
        writeb(0x00, devpriv->mite->daq_io_addr + Master_Interrupt_Control);
 
        ret = request_irq(mite_irq(devpriv->mite), ni6527_interrupt,
-                         IRQF_SHARED, DRIVER_NAME, dev);
+                         IRQF_SHARED, dev->board_name, dev);
        if (ret < 0)
                dev_warn(dev->class_dev, "irq not available\n");
        else
@@ -422,7 +420,7 @@ static void ni6527_detach(struct comedi_device *dev)
 }
 
 static struct comedi_driver ni6527_driver = {
-       .driver_name = DRIVER_NAME,
+       .driver_name = "ni_6527",
        .module = THIS_MODULE,
        .auto_attach = ni6527_auto_attach,
        .detach = ni6527_detach,
@@ -442,7 +440,7 @@ static DEFINE_PCI_DEVICE_TABLE(ni6527_pci_table) = {
 MODULE_DEVICE_TABLE(pci, ni6527_pci_table);
 
 static struct pci_driver ni6527_pci_driver = {
-       .name           = DRIVER_NAME,
+       .name           = "ni_6527",
        .id_table       = ni6527_pci_table,
        .probe          = ni6527_pci_probe,
        .remove         = comedi_pci_auto_unconfig,