diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-07-18 17:01:23 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 14:43:01 -0700 |
| commit | 3d03cfcaf6cde186f439ca1a318423007570760a (patch) | |
| tree | ca00a75a42a48b93e3e0e9c987b42c453f2f1ede /drivers/staging/comedi/drivers/amplc_pc236.c | |
| parent | staging: comedi: drivers: remove unnecessary *_SIZE defines (diff) | |
| download | linux-dev-3d03cfcaf6cde186f439ca1a318423007570760a.tar.xz linux-dev-3d03cfcaf6cde186f439ca1a318423007570760a.zip | |
staging: comedi: drivers: remove unnecessary DRIVER_NAME defines
These defines are usually only used to initialize the driver_name
member of the comedi_driver struct. Some of the drivers also use
the define as part of dev_{level}() messages and/or when doing a
request_irq().
The addition of the DRIVER_NAME to the messages is just added noise
and the dev->board_name is typically used in the request_irq().
Just remove all the DRIVER_NAME defines.
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/amplc_pc236.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_pc236.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c index 6089341d2135..243b0f4d0312 100644 --- a/drivers/staging/comedi/drivers/amplc_pc236.c +++ b/drivers/staging/comedi/drivers/amplc_pc236.c @@ -57,8 +57,6 @@ unused. #include "8255.h" #include "plx9052.h" -#define PC236_DRIVER_NAME "amplc_pc236" - #define DO_ISA IS_ENABLED(CONFIG_COMEDI_AMPLC_PC236_ISA) #define DO_PCI IS_ENABLED(CONFIG_COMEDI_AMPLC_PC236_PCI) @@ -111,7 +109,7 @@ static const struct pc236_board pc236_boards[] = { .model = pci236_model, }, { - .name = PC236_DRIVER_NAME, + .name = "amplc_pc236", .devid = PCI_DEVICE_ID_INVALID, .bustype = pci_bustype, .model = anypci_model, /* wildcard */ @@ -391,7 +389,7 @@ static int pc236_common_attach(struct comedi_device *dev, unsigned long iobase, pc236_intr_disable(dev); if (irq) { if (request_irq(irq, pc236_interrupt, req_irq_flags, - PC236_DRIVER_NAME, dev) >= 0) { + dev->board_name, dev) >= 0) { dev->irq = irq; s->type = COMEDI_SUBD_DI; s->subdev_flags = SDF_READABLE | SDF_CMD_READ; @@ -459,8 +457,7 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it) return pc236_pci_common_attach(dev, pci_dev); } - dev_err(dev->class_dev, PC236_DRIVER_NAME - ": BUG! cannot determine board type!\n"); + dev_err(dev->class_dev, "BUG! cannot determine board type!\n"); return -EINVAL; } @@ -478,8 +475,7 @@ static int pc236_auto_attach(struct comedi_device *dev, if (!DO_PCI) return -EINVAL; - dev_info(dev->class_dev, PC236_DRIVER_NAME ": attach pci %s\n", - pci_name(pci_dev)); + dev_info(dev->class_dev, "attach pci %s\n", pci_name(pci_dev)); devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv)); if (!devpriv) @@ -528,7 +524,7 @@ static void pc236_detach(struct comedi_device *dev) * the device code. */ static struct comedi_driver amplc_pc236_driver = { - .driver_name = PC236_DRIVER_NAME, + .driver_name = "amplc_pc236", .module = THIS_MODULE, .attach = pc236_attach, .auto_attach = pc236_auto_attach, @@ -554,7 +550,7 @@ static int amplc_pc236_pci_probe(struct pci_dev *dev, } static struct pci_driver amplc_pc236_pci_driver = { - .name = PC236_DRIVER_NAME, + .name = "amplc_pc236", .id_table = pc236_pci_table, .probe = &lc_pc236_pci_probe, .remove = comedi_pci_auto_unconfig, |