Commit 6d8b0f5b authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

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



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: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a4cff8b8

drivers/staging/comedi/drivers/addi-data/addi_common.c

+6 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/comedi/drivers/addi_apci_035.c

+2 −0
Original line number Diff line number Diff line
@@ -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"

drivers/staging/comedi/drivers/addi_apci_1032.c

+2 −0
Original line number Diff line number Diff line 
#define CONFIG_APCI_1032 1



#define ADDIDATA_DRIVER_NAME	"addi_apci_1032"



#include "addi-data/addi_common.c"

drivers/staging/comedi/drivers/addi_apci_1500.c

+2 −0
Original line number Diff line number Diff line 
#define CONFIG_APCI_1500 1



#define ADDIDATA_DRIVER_NAME	"addi_apci_1500"



#include "addi-data/addi_common.c"

drivers/staging/comedi/drivers/addi_apci_1516.c

+2 −0
Original line number Diff line number Diff line 
#define CONFIG_APCI_1516 1



#define ADDIDATA_DRIVER_NAME	"addi_apci_1516"



#include "addi-data/addi_common.c"

CRA Git | Maintained and supported by SUSTech CRA and CCSE