summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-03-22 09:46:28 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-25 11:41:52 -0700
commit147a85d7dbda7f672deddba46f7165e26036c4ab (patch)
treeb72783f0efcacbad32d68889407844cab88dca35
parent7b09c9f63d70cf9aa54455b22f3f9e0df596d8c2 (diff)
staging: comedi: ni_labpc: remove DRV_NAME
Remove the DRV_NAME define and just open code the string in the comedi_driver and pci_driver declarations. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/ni_labpc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index 887fa8cc2684..54669b46e7e2 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -89,8 +89,6 @@ NI manuals:
#include "comedi_fc.h"
#include "ni_labpc.h"
-#define DRV_NAME "ni_labpc"
-
/* size of io region used by board */
#define LABPC_SIZE 32
/* 2 MHz master clock */
@@ -1969,7 +1967,7 @@ void labpc_common_detach(struct comedi_device *dev)
EXPORT_SYMBOL_GPL(labpc_common_detach);
static struct comedi_driver labpc_driver = {
- .driver_name = DRV_NAME,
+ .driver_name = "ni_labpc",
.module = THIS_MODULE,
.attach = labpc_attach,
.auto_attach = labpc_auto_attach,
@@ -1993,7 +1991,7 @@ static int labpc_pci_probe(struct pci_dev *dev,
}
static struct pci_driver labpc_pci_driver = {
- .name = DRV_NAME,
+ .name = "ni_labpc",
.id_table = labpc_pci_table,
.probe = labpc_pci_probe,
.remove = comedi_pci_auto_unconfig,