Skip to content

Commit

Permalink
staging: comedi: ni_6527: change driver name string
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Sep 17, 2012
1 parent ca33f4c commit 38b951f
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/staging/comedi/drivers/ni_6527.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 38b951f

Please sign in to comment.