Commit 92cba8f3 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi-data: use auto_attach instead of attach_pci 



Change the addi-data drivers that use the "common" code so they
attach using the generic 'auto_attach' method instead the pci
specific 'attach_pci' method. The 'attach_pci' is deprecated and
is going to be removed.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a9c2ba17

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

+3 −2
Original line number Diff line number Diff line
@@ -93,9 +93,10 @@ static const void *addi_find_boardinfo(struct comedi_device *dev, 
	return NULL;

}



static int addi_attach_pci(struct comedi_device *dev,

			   struct pci_dev *pcidev)

static int __devinit addi_auto_attach(struct comedi_device *dev,

				      unsigned long context_unused)

{

	struct pci_dev *pcidev = comedi_to_pci_dev(dev);

	const struct addi_board *this_board;

	struct addi_private *devpriv;

	struct comedi_subdevice *s;

drivers/staging/comedi/drivers/addi_apci_035.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static const struct addi_board apci035_boardtypes[] = { 
static struct comedi_driver apci035_driver = {

	.driver_name	= "addi_apci_035",

	.module		= THIS_MODULE,

	.attach_pci	= addi_attach_pci,

	.auto_attach	= addi_auto_attach,

	.detach		= i_ADDI_Detach,

	.num_names	= ARRAY_SIZE(apci035_boardtypes),

	.board_name	= &apci035_boardtypes[0].pc_DriverName,

drivers/staging/comedi/drivers/addi_apci_1500.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static const struct addi_board apci1500_boardtypes[] = { 
static struct comedi_driver apci1500_driver = {

	.driver_name	= "addi_apci_1500",

	.module		= THIS_MODULE,

	.attach_pci	= addi_attach_pci,

	.auto_attach	= addi_auto_attach,

	.detach		= i_ADDI_Detach,

	.num_names	= ARRAY_SIZE(apci1500_boardtypes),

	.board_name	= &apci1500_boardtypes[0].pc_DriverName,

drivers/staging/comedi/drivers/addi_apci_1516.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static const struct addi_board apci1516_boardtypes[] = { 
static struct comedi_driver apci1516_driver = {

	.driver_name	= "addi_apci_1516",

	.module		= THIS_MODULE,

	.attach_pci	= addi_attach_pci,

	.auto_attach	= addi_auto_attach,

	.detach		= i_ADDI_Detach,

	.num_names	= ARRAY_SIZE(apci1516_boardtypes),

	.board_name	= &apci1516_boardtypes[0].pc_DriverName,

drivers/staging/comedi/drivers/addi_apci_1564.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static const struct addi_board apci1564_boardtypes[] = { 
static struct comedi_driver apci1564_driver = {

	.driver_name	= "addi_apci_1564",

	.module		= THIS_MODULE,

	.attach_pci	= addi_attach_pci,

	.auto_attach	= addi_auto_attach,

	.detach		= i_ADDI_Detach,

	.num_names	= ARRAY_SIZE(apci1564_boardtypes),

	.board_name	= &apci1564_boardtypes[0].pc_DriverName,