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

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
...@@ -93,9 +93,10 @@ static const void *addi_find_boardinfo(struct comedi_device *dev, ...@@ -93,9 +93,10 @@ static const void *addi_find_boardinfo(struct comedi_device *dev,
return NULL; return NULL;
} }
static int addi_attach_pci(struct comedi_device *dev, static int __devinit addi_auto_attach(struct comedi_device *dev,
struct pci_dev *pcidev) unsigned long context_unused)
{ {
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
const struct addi_board *this_board; const struct addi_board *this_board;
struct addi_private *devpriv; struct addi_private *devpriv;
struct comedi_subdevice *s; struct comedi_subdevice *s;
......
...@@ -40,7 +40,7 @@ static const struct addi_board apci035_boardtypes[] = { ...@@ -40,7 +40,7 @@ static const struct addi_board apci035_boardtypes[] = {
static struct comedi_driver apci035_driver = { static struct comedi_driver apci035_driver = {
.driver_name = "addi_apci_035", .driver_name = "addi_apci_035",
.module = THIS_MODULE, .module = THIS_MODULE,
.attach_pci = addi_attach_pci, .auto_attach = addi_auto_attach,
.detach = i_ADDI_Detach, .detach = i_ADDI_Detach,
.num_names = ARRAY_SIZE(apci035_boardtypes), .num_names = ARRAY_SIZE(apci035_boardtypes),
.board_name = &apci035_boardtypes[0].pc_DriverName, .board_name = &apci035_boardtypes[0].pc_DriverName,
......
...@@ -40,7 +40,7 @@ static const struct addi_board apci1500_boardtypes[] = { ...@@ -40,7 +40,7 @@ static const struct addi_board apci1500_boardtypes[] = {
static struct comedi_driver apci1500_driver = { static struct comedi_driver apci1500_driver = {
.driver_name = "addi_apci_1500", .driver_name = "addi_apci_1500",
.module = THIS_MODULE, .module = THIS_MODULE,
.attach_pci = addi_attach_pci, .auto_attach = addi_auto_attach,
.detach = i_ADDI_Detach, .detach = i_ADDI_Detach,
.num_names = ARRAY_SIZE(apci1500_boardtypes), .num_names = ARRAY_SIZE(apci1500_boardtypes),
.board_name = &apci1500_boardtypes[0].pc_DriverName, .board_name = &apci1500_boardtypes[0].pc_DriverName,
......
...@@ -33,7 +33,7 @@ static const struct addi_board apci1516_boardtypes[] = { ...@@ -33,7 +33,7 @@ static const struct addi_board apci1516_boardtypes[] = {
static struct comedi_driver apci1516_driver = { static struct comedi_driver apci1516_driver = {
.driver_name = "addi_apci_1516", .driver_name = "addi_apci_1516",
.module = THIS_MODULE, .module = THIS_MODULE,
.attach_pci = addi_attach_pci, .auto_attach = addi_auto_attach,
.detach = i_ADDI_Detach, .detach = i_ADDI_Detach,
.num_names = ARRAY_SIZE(apci1516_boardtypes), .num_names = ARRAY_SIZE(apci1516_boardtypes),
.board_name = &apci1516_boardtypes[0].pc_DriverName, .board_name = &apci1516_boardtypes[0].pc_DriverName,
......
...@@ -37,7 +37,7 @@ static const struct addi_board apci1564_boardtypes[] = { ...@@ -37,7 +37,7 @@ static const struct addi_board apci1564_boardtypes[] = {
static struct comedi_driver apci1564_driver = { static struct comedi_driver apci1564_driver = {
.driver_name = "addi_apci_1564", .driver_name = "addi_apci_1564",
.module = THIS_MODULE, .module = THIS_MODULE,
.attach_pci = addi_attach_pci, .auto_attach = addi_auto_attach,
.detach = i_ADDI_Detach, .detach = i_ADDI_Detach,
.num_names = ARRAY_SIZE(apci1564_boardtypes), .num_names = ARRAY_SIZE(apci1564_boardtypes),
.board_name = &apci1564_boardtypes[0].pc_DriverName, .board_name = &apci1564_boardtypes[0].pc_DriverName,
......
...@@ -39,7 +39,7 @@ static const struct addi_board apci16xx_boardtypes[] = { ...@@ -39,7 +39,7 @@ static const struct addi_board apci16xx_boardtypes[] = {
static struct comedi_driver apci16xx_driver = { static struct comedi_driver apci16xx_driver = {
.driver_name = "addi_apci_16xx", .driver_name = "addi_apci_16xx",
.module = THIS_MODULE, .module = THIS_MODULE,
.attach_pci = addi_attach_pci, .auto_attach = addi_auto_attach,
.detach = i_ADDI_Detach, .detach = i_ADDI_Detach,
.num_names = ARRAY_SIZE(apci16xx_boardtypes), .num_names = ARRAY_SIZE(apci16xx_boardtypes),
.board_name = &apci16xx_boardtypes[0].pc_DriverName, .board_name = &apci16xx_boardtypes[0].pc_DriverName,
......
...@@ -31,7 +31,7 @@ static const struct addi_board apci2016_boardtypes[] = { ...@@ -31,7 +31,7 @@ static const struct addi_board apci2016_boardtypes[] = {
static struct comedi_driver apci2016_driver = { static struct comedi_driver apci2016_driver = {
.driver_name = "addi_apci_2016", .driver_name = "addi_apci_2016",
.module = THIS_MODULE, .module = THIS_MODULE,
.attach_pci = addi_attach_pci, .auto_attach = addi_auto_attach,
.detach = i_ADDI_Detach, .detach = i_ADDI_Detach,
.num_names = ARRAY_SIZE(apci2016_boardtypes), .num_names = ARRAY_SIZE(apci2016_boardtypes),
.board_name = &apci2016_boardtypes[0].pc_DriverName, .board_name = &apci2016_boardtypes[0].pc_DriverName,
......
...@@ -34,7 +34,7 @@ static const struct addi_board apci2032_boardtypes[] = { ...@@ -34,7 +34,7 @@ static const struct addi_board apci2032_boardtypes[] = {
static struct comedi_driver apci2032_driver = { static struct comedi_driver apci2032_driver = {
.driver_name = "addi_apci_2032", .driver_name = "addi_apci_2032",
.module = THIS_MODULE, .module = THIS_MODULE,
.attach_pci = addi_attach_pci, .auto_attach = addi_auto_attach,
.detach = i_ADDI_Detach, .detach = i_ADDI_Detach,
.num_names = ARRAY_SIZE(apci2032_boardtypes), .num_names = ARRAY_SIZE(apci2032_boardtypes),
.board_name = &apci2032_boardtypes[0].pc_DriverName, .board_name = &apci2032_boardtypes[0].pc_DriverName,
......
...@@ -32,7 +32,7 @@ static const struct addi_board apci2200_boardtypes[] = { ...@@ -32,7 +32,7 @@ static const struct addi_board apci2200_boardtypes[] = {
static struct comedi_driver apci2200_driver = { static struct comedi_driver apci2200_driver = {
.driver_name = "addi_apci_2200", .driver_name = "addi_apci_2200",
.module = THIS_MODULE, .module = THIS_MODULE,
.attach_pci = addi_attach_pci, .auto_attach = addi_auto_attach,
.detach = i_ADDI_Detach, .detach = i_ADDI_Detach,
.num_names = ARRAY_SIZE(apci2200_boardtypes), .num_names = ARRAY_SIZE(apci2200_boardtypes),
.board_name = &apci2200_boardtypes[0].pc_DriverName, .board_name = &apci2200_boardtypes[0].pc_DriverName,
......
...@@ -93,7 +93,7 @@ MODULE_DEVICE_TABLE(pci, apci3200_pci_table); ...@@ -93,7 +93,7 @@ MODULE_DEVICE_TABLE(pci, apci3200_pci_table);
static struct comedi_driver apci3200_driver = { static struct comedi_driver apci3200_driver = {
.driver_name = "addi_apci_3200", .driver_name = "addi_apci_3200",
.module = THIS_MODULE, .module = THIS_MODULE,
.attach_pci = addi_attach_pci, .auto_attach = addi_auto_attach,
.detach = i_ADDI_Detach, .detach = i_ADDI_Detach,
.num_names = ARRAY_SIZE(apci3200_boardtypes), .num_names = ARRAY_SIZE(apci3200_boardtypes),
.board_name = &apci3200_boardtypes[0].pc_DriverName, .board_name = &apci3200_boardtypes[0].pc_DriverName,
......
...@@ -44,7 +44,7 @@ MODULE_DEVICE_TABLE(pci, apci3501_pci_table); ...@@ -44,7 +44,7 @@ MODULE_DEVICE_TABLE(pci, apci3501_pci_table);
static struct comedi_driver apci3501_driver = { static struct comedi_driver apci3501_driver = {
.driver_name = "addi_apci_3501", .driver_name = "addi_apci_3501",
.module = THIS_MODULE, .module = THIS_MODULE,
.attach_pci = addi_attach_pci, .auto_attach = addi_auto_attach,
.detach = i_ADDI_Detach, .detach = i_ADDI_Detach,
.num_names = ARRAY_SIZE(apci3501_boardtypes), .num_names = ARRAY_SIZE(apci3501_boardtypes),
.board_name = &apci3501_boardtypes[0].pc_DriverName, .board_name = &apci3501_boardtypes[0].pc_DriverName,
......
...@@ -738,7 +738,7 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -738,7 +738,7 @@ static const struct addi_board apci3xxx_boardtypes[] = {
static struct comedi_driver apci3xxx_driver = { static struct comedi_driver apci3xxx_driver = {
.driver_name = "addi_apci_3xxx", .driver_name = "addi_apci_3xxx",
.module = THIS_MODULE, .module = THIS_MODULE,
.attach_pci = addi_attach_pci, .auto_attach = addi_auto_attach,
.detach = i_ADDI_Detach, .detach = i_ADDI_Detach,
.num_names = ARRAY_SIZE(apci3xxx_boardtypes), .num_names = ARRAY_SIZE(apci3xxx_boardtypes),
.board_name = &apci3xxx_boardtypes[0].pc_DriverName, .board_name = &apci3xxx_boardtypes[0].pc_DriverName,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment