aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/drivers/skel.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:21:58 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 14:14:56 -0800
commita690b7e535f2f97a3a05ee570715abeb60a8910f (patch)
tree08ee691342c382ee17dabc87d8fe1c6fb316ce44 /drivers/staging/comedi/drivers/skel.c
parentstaging: comedi: remove use of __devexit_p (diff)
downloadlinux-dev-a690b7e535f2f97a3a05ee570715abeb60a8910f.tar.xz
linux-dev-a690b7e535f2f97a3a05ee570715abeb60a8910f.zip
staging: comedi: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/skel.c')
-rw-r--r--drivers/staging/comedi/drivers/skel.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c
index 98c1868ab03d..bbf673f419e3 100644
--- a/drivers/staging/comedi/drivers/skel.c
+++ b/drivers/staging/comedi/drivers/skel.c
@@ -541,16 +541,12 @@ static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it)
* comedi_usb_auto_config(), etc.) to handle devices that can be attached
* to the Comedi core automatically without the COMEDI_DEVCONFIG ioctl.
*
- * For PCI devices, comedi_pci_auto_config() is usually called directly from
- * the struct pci_driver probe() function, so this _auto_attach() function
- * can be tagged __devinit.
- *
* The context parameter is usually unused, but if the driver called
* comedi_auto_config() directly instead of the comedi_pci_auto_config()
* wrapper function, this will be a copy of the context passed to
* comedi_auto_config().
*/
-static int __devinit skel_auto_attach(struct comedi_device *dev,
+static int skel_auto_attach(struct comedi_device *dev,
unsigned long context)
{
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -705,7 +701,7 @@ static DEFINE_PCI_DEVICE_TABLE(skel_pci_table) = {
};
MODULE_DEVICE_TABLE(pci, skel_pci_table);
-static int __devinit skel_pci_probe(struct pci_dev *dev,
+static int skel_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, &skel_driver);