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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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,

drivers/staging/comedi/drivers/addi_apci_16xx.c

@@ -39,7 +39,7 @@ static const struct addi_board apci16xx_boardtypes[] = {
 static struct comedi_driver apci16xx_driver = {
 	.driver_name	= "addi_apci_16xx",
 	.module		= THIS_MODULE,
-	.attach_pci	= addi_attach_pci,
+	.auto_attach	= addi_auto_attach,
 	.detach		= i_ADDI_Detach,
 	.num_names	= ARRAY_SIZE(apci16xx_boardtypes),
 	.board_name	= &apci16xx_boardtypes[0].pc_DriverName,

drivers/staging/comedi/drivers/addi_apci_2016.c

@@ -31,7 +31,7 @@ static const struct addi_board apci2016_boardtypes[] = {
 static struct comedi_driver apci2016_driver = {
 	.driver_name	= "addi_apci_2016",
 	.module		= THIS_MODULE,
-	.attach_pci	= addi_attach_pci,
+	.auto_attach	= addi_auto_attach,
 	.detach		= i_ADDI_Detach,
 	.num_names	= ARRAY_SIZE(apci2016_boardtypes),
 	.board_name	= &apci2016_boardtypes[0].pc_DriverName,

drivers/staging/comedi/drivers/addi_apci_2032.c

@@ -34,7 +34,7 @@ static const struct addi_board apci2032_boardtypes[] = {
 static struct comedi_driver apci2032_driver = {
 	.driver_name	= "addi_apci_2032",
 	.module		= THIS_MODULE,
-	.attach_pci	= addi_attach_pci,
+	.auto_attach	= addi_auto_attach,
 	.detach		= i_ADDI_Detach,
 	.num_names	= ARRAY_SIZE(apci2032_boardtypes),
 	.board_name	= &apci2032_boardtypes[0].pc_DriverName,

drivers/staging/comedi/drivers/addi_apci_2200.c

@@ -32,7 +32,7 @@ static const struct addi_board apci2200_boardtypes[] = {
 static struct comedi_driver apci2200_driver = {
 	.driver_name	= "addi_apci_2200",
 	.module		= THIS_MODULE,
-	.attach_pci	= addi_attach_pci,
+	.auto_attach	= addi_auto_attach,
 	.detach		= i_ADDI_Detach,
 	.num_names	= ARRAY_SIZE(apci2200_boardtypes),
 	.board_name	= &apci2200_boardtypes[0].pc_DriverName,

drivers/staging/comedi/drivers/addi_apci_3200.c

@@ -93,7 +93,7 @@ MODULE_DEVICE_TABLE(pci, apci3200_pci_table);
 static struct comedi_driver apci3200_driver = {
 	.driver_name	= "addi_apci_3200",
 	.module		= THIS_MODULE,
-	.attach_pci	= addi_attach_pci,
+	.auto_attach	= addi_auto_attach,
 	.detach		= i_ADDI_Detach,
 	.num_names	= ARRAY_SIZE(apci3200_boardtypes),
 	.board_name	= &apci3200_boardtypes[0].pc_DriverName,

drivers/staging/comedi/drivers/addi_apci_3501.c

@@ -44,7 +44,7 @@ MODULE_DEVICE_TABLE(pci, apci3501_pci_table);
 static struct comedi_driver apci3501_driver = {
 	.driver_name	= "addi_apci_3501",
 	.module		= THIS_MODULE,
-	.attach_pci	= addi_attach_pci,
+	.auto_attach	= addi_auto_attach,
 	.detach		= i_ADDI_Detach,
 	.num_names	= ARRAY_SIZE(apci3501_boardtypes),
 	.board_name	= &apci3501_boardtypes[0].pc_DriverName,

drivers/staging/comedi/drivers/addi_apci_3xxx.c

@@ -738,7 +738,7 @@ static const struct addi_board apci3xxx_boardtypes[] = {
 static struct comedi_driver apci3xxx_driver = {
 	.driver_name	= "addi_apci_3xxx",
 	.module		= THIS_MODULE,
-	.attach_pci	= addi_attach_pci,
+	.auto_attach	= addi_auto_attach,
 	.detach		= i_ADDI_Detach,
 	.num_names	= ARRAY_SIZE(apci3xxx_boardtypes),
 	.board_name	= &apci3xxx_boardtypes[0].pc_DriverName,