staging: comedi: ni_6527: change driver name string
authorIan Abbott <abbotti@mev.co.uk>
Fri, 14 Sep 2012 16:33:59 +0000 (17:33 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Sep 2012 12:09:02 +0000 (05:09 -0700)
Change the driver name string used in data structures, kernel messages,
etc. from "ni6527" to "ni_6527" to match the module name.  Use a macro
`DRIVER_NAME` that expands to this string literal.

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

index 1f52f3652a6991b839b769071d630f7c27c1548d..6f0659a58b69f41dc9349c576ea50e6e50dc4b45 100644 (file)
@@ -46,6 +46,8 @@ Updated: Sat, 25 Jan 2003 13:24:40 -0800
 
 #include "mite.h"
 
+#define DRIVER_NAME "ni_6527"
+
 #define NI6527_DIO_SIZE 4096
 #define NI6527_MITE_SIZE 4096
 
@@ -80,7 +82,7 @@ static int ni6527_attach(struct comedi_device *dev,
                         struct comedi_devconfig *it);
 static void ni6527_detach(struct comedi_device *dev);
 static struct comedi_driver driver_ni6527 = {
-       .driver_name = "ni6527",
+       .driver_name = DRIVER_NAME,
        .module = THIS_MODULE,
        .attach = ni6527_attach,
        .detach = ni6527_detach,
@@ -430,7 +432,7 @@ static int ni6527_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        writeb(0x00, devpriv->mite->daq_io_addr + Master_Interrupt_Control);
 
        ret = request_irq(mite_irq(devpriv->mite), ni6527_interrupt,
-                         IRQF_SHARED, "ni6527", dev);
+                         IRQF_SHARED, DRIVER_NAME, dev);
        if (ret < 0)
                dev_warn(dev->class_dev, "irq not available\n");
        else
@@ -471,7 +473,7 @@ static int ni6527_find_device(struct comedi_device *dev, int bus, int slot)
                        }
                }
        }
-       dev_err(dev->class_dev, "ni6527: no device found\n");
+       dev_err(dev->class_dev, DRIVER_NAME ": no device found\n");
        mite_list_devices();
        return -EIO;
 }