renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 17:23:55 +08:00
Code

Staging: comedi: Give the addi_apci_* drivers different driver names

Browse Source 
It is not currently possible for more than one of the addi_apci_*
drivers to register themselves with comedi at once because they all use
the same comedi driver name "addi_common".  Give them different names.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Ian Abbott 2010-05-19 15:11:57 +01:00 committed by Greg Kroah-Hartman
parent a4cff8b82a
commit 6d8b0f5be5
17 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/comedi/drivers/addi-data/addi_common.c
View File

@ -68,6 +68,10 @@ You should also find the complete GPL in the COPYING file accompanying this sour
#include "addi_common.h"
#include "addi_amcc_s5933.h"
#ifndef ADDIDATA_DRIVER_NAME
#define ADDIDATA_DRIVER_NAME "addi_common"
#endif
/* Update-0.7.57->0.7.68MODULE_AUTHOR("ADDI-DATA GmbH <info@addi-data.com>"); */
/* Update-0.7.57->0.7.68MODULE_DESCRIPTION("Comedi ADDI-DATA module"); */
/* Update-0.7.57->0.7.68MODULE_LICENSE("GPL"); */
@ -2528,7 +2532,7 @@ static const struct addi_board boardtypes[] = {
#define n_boardtypes (sizeof(boardtypes)/sizeof(struct addi_board))
static struct comedi_driver driver_addi = {
.driver_name = "addi_common",
.driver_name = ADDIDATA_DRIVER_NAME,
.module = THIS_MODULE,
.attach = i_ADDI_Attach,
.detach = i_ADDI_Detach,
@ -2583,7 +2587,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
v_pci_card_list_init(this_board->i_VendorId, 1); /* 1 for displaying the list.. */
pci_list_builded = 1;
}
/* printk("comedi%d: addi_common: board=%s",dev->minor,this_board->pc_DriverName); */
/* printk("comedi%d: "ADDIDATA_DRIVER_NAME": board=%s",dev->minor,this_board->pc_DriverName); */
if ((this_board->i_Dma) && (it->options[2] == 0)) {
i_Dma = 1;

2
drivers/staging/comedi/drivers/addi_apci_035.c
View File

@ -2,4 +2,6 @@
#define ADDIDATA_WATCHDOG 2 /* Or shold it be something else */
#define ADDIDATA_DRIVER_NAME "addi_apci_035"
#include "addi-data/addi_common.c"

2
drivers/staging/comedi/drivers/addi_apci_1032.c
View File

@ -1,3 +1,5 @@
#define CONFIG_APCI_1032 1
#define ADDIDATA_DRIVER_NAME "addi_apci_1032"
#include "addi-data/addi_common.c"

2
drivers/staging/comedi/drivers/addi_apci_1500.c
View File

@ -1,3 +1,5 @@
#define CONFIG_APCI_1500 1
#define ADDIDATA_DRIVER_NAME "addi_apci_1500"
#include "addi-data/addi_common.c"

2
drivers/staging/comedi/drivers/addi_apci_1516.c
View File

@ -1,3 +1,5 @@
#define CONFIG_APCI_1516 1
#define ADDIDATA_DRIVER_NAME "addi_apci_1516"
#include "addi-data/addi_common.c"

2
drivers/staging/comedi/drivers/addi_apci_1564.c
View File

@ -1,3 +1,5 @@
#define CONFIG_APCI_1564 1
#define ADDIDATA_DRIVER_NAME "addi_apci_1564"
#include "addi-data/addi_common.c"

2
drivers/staging/comedi/drivers/addi_apci_16xx.c
View File

@ -1,3 +1,5 @@
#define CONFIG_APCI_16XX 1
#define ADDIDATA_DRIVER_NAME "addi_apci_16xx"
#include "addi-data/addi_common.c"

2
drivers/staging/comedi/drivers/addi_apci_1710.c
View File

@ -1,3 +1,5 @@
#define CONFIG_APCI_1710 1
#define ADDIDATA_DRIVER_NAME "addi_apci_1710"
#include "addi-data/addi_common.c"

2
drivers/staging/comedi/drivers/addi_apci_2016.c
View File

@ -1,3 +1,5 @@
#define CONFIG_APCI_2016 1
#define ADDIDATA_DRIVER_NAME "addi_apci_2016"
#include "addi-data/addi_common.c"

2
drivers/staging/comedi/drivers/addi_apci_2032.c
View File

@ -1,3 +1,5 @@
#define CONFIG_APCI_2032 1
#define ADDIDATA_DRIVER_NAME "addi_apci_2032"
#include "addi-data/addi_common.c"

2
drivers/staging/comedi/drivers/addi_apci_2200.c
View File

@ -1,3 +1,5 @@
#define CONFIG_APCI_2200 1
#define ADDIDATA_DRIVER_NAME "addi_apci_2200"
#include "addi-data/addi_common.c"

2
drivers/staging/comedi/drivers/addi_apci_3001.c
View File

@ -1,3 +1,5 @@
#define CONFIG_APCI_3001 1
#define ADDIDATA_DRIVER_NAME "addi_apci_3001"
#include "addi-data/addi_common.c"

2
drivers/staging/comedi/drivers/addi_apci_3120.c
View File

@ -1,3 +1,5 @@
#define CONFIG_APCI_3120 1
#define ADDIDATA_DRIVER_NAME "addi_apci_3120"
#include "addi-data/addi_common.c"

2
drivers/staging/comedi/drivers/addi_apci_3200.c
View File

@ -1,3 +1,5 @@
#define CONFIG_APCI_3200 1
#define ADDIDATA_DRIVER_NAME "addi_apci_3200"
#include "addi-data/addi_common.c"

2
drivers/staging/comedi/drivers/addi_apci_3300.c
View File

@ -1,3 +1,5 @@
#define CONFIG_APCI_3300 1
#define ADDIDATA_DRIVER_NAME "addi_apci_3300"
#include "addi-data/addi_common.c"

2
drivers/staging/comedi/drivers/addi_apci_3501.c
View File

@ -1,3 +1,5 @@
#define CONFIG_APCI_3501 1
#define ADDIDATA_DRIVER_NAME "addi_apci_3501"
#include "addi-data/addi_common.c"

2
drivers/staging/comedi/drivers/addi_apci_3xxx.c
View File

@ -1,3 +1,5 @@
#define CONFIG_APCI_3XXX 1
#define ADDIDATA_DRIVER_NAME "addi_apci_3xxx"
#include "addi-data/addi_common.c"