diff options
author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-08-17 12:34:52 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-17 12:48:10 -0400 |
commit | d602a064f9818819d6c99d99f101bc6b1ae1540d (patch) | |
tree | d2bf0f1a9b85f6c9e71563982851acb16b7460ef | |
parent | bf2023614201b36f929cce0d9fbb3cc856ea7c1a (diff) |
staging: comedi: contec_pci: remove manual legacy attach
This driver uses the 'attach_pci' callback to attach the pci device
to the comedi subsystem. Since the 'attach' callback is now optional
it can be removed from the driver.
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>
-rw-r--r-- | drivers/staging/comedi/drivers/contec_pci_dio.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c index 12ad9fa32f56..def3e7d6789d 100644 --- a/drivers/staging/comedi/drivers/contec_pci_dio.c +++ b/drivers/staging/comedi/drivers/contec_pci_dio.c | |||
@@ -108,15 +108,6 @@ static int contec_attach_pci(struct comedi_device *dev, | |||
108 | return 0; | 108 | return 0; |
109 | } | 109 | } |
110 | 110 | ||
111 | static int contec_attach(struct comedi_device *dev, | ||
112 | struct comedi_devconfig *it) | ||
113 | { | ||
114 | dev_warn(dev->class_dev, | ||
115 | "This driver does not support attach using comedi_config\n"); | ||
116 | |||
117 | return -ENOSYS; | ||
118 | } | ||
119 | |||
120 | static void contec_detach(struct comedi_device *dev) | 111 | static void contec_detach(struct comedi_device *dev) |
121 | { | 112 | { |
122 | struct pci_dev *pcidev = comedi_to_pci_dev(dev); | 113 | struct pci_dev *pcidev = comedi_to_pci_dev(dev); |
@@ -130,7 +121,6 @@ static void contec_detach(struct comedi_device *dev) | |||
130 | static struct comedi_driver contec_pci_dio_driver = { | 121 | static struct comedi_driver contec_pci_dio_driver = { |
131 | .driver_name = "contec_pci_dio", | 122 | .driver_name = "contec_pci_dio", |
132 | .module = THIS_MODULE, | 123 | .module = THIS_MODULE, |
133 | .attach = contec_attach, | ||
134 | .attach_pci = contec_attach_pci, | 124 | .attach_pci = contec_attach_pci, |
135 | .detach = contec_detach, | 125 | .detach = contec_detach, |
136 | }; | 126 | }; |