diff options
author | Peter Huewe <peterhuewe@gmx.de> | 2013-01-22 18:03:30 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 15:04:36 -0500 |
commit | c2f90a20c9166bf9effb064703903039a49324e3 (patch) | |
tree | 309e9b786e123cff8dc9ec3de6fe36ce274125c6 | |
parent | 1ef0cfb192905d0e8d03d15a69b446c26d54c81f (diff) |
staging/comedi: Move comedi_pci_auto_unconfig to drivers.c
Since comedi_pci_auto_unconfig cannot be inlined anymore after
staging/comedi: Use comedi_pci_auto_unconfig directly for
pci_driver.remove
is applied, it makes sense to move it drivers.c
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/comedi/comedidev.h | 5 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index 6211d440e457..e2b7d606e1c0 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h | |||
@@ -484,10 +484,7 @@ static inline int comedi_pci_auto_config(struct pci_dev *pcidev, | |||
484 | return comedi_auto_config(&pcidev->dev, driver, 0); | 484 | return comedi_auto_config(&pcidev->dev, driver, 0); |
485 | } | 485 | } |
486 | 486 | ||
487 | static inline void comedi_pci_auto_unconfig(struct pci_dev *pcidev) | 487 | void comedi_pci_auto_unconfig(struct pci_dev *pcidev); |
488 | { | ||
489 | comedi_auto_unconfig(&pcidev->dev); | ||
490 | } | ||
491 | 488 | ||
492 | static inline int comedi_usb_auto_config(struct usb_interface *intf, | 489 | static inline int comedi_usb_auto_config(struct usb_interface *intf, |
493 | struct comedi_driver *driver) | 490 | struct comedi_driver *driver) |
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index 1c7d4da9775a..87eeee58bda7 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c | |||
@@ -558,6 +558,12 @@ void comedi_pci_driver_unregister(struct comedi_driver *comedi_driver, | |||
558 | } | 558 | } |
559 | EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister); | 559 | EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister); |
560 | 560 | ||
561 | void comedi_pci_auto_unconfig(struct pci_dev *pcidev) | ||
562 | { | ||
563 | comedi_auto_unconfig(&pcidev->dev); | ||
564 | } | ||
565 | EXPORT_SYMBOL_GPL(comedi_pci_auto_unconfig); | ||
566 | |||
561 | #if IS_ENABLED(CONFIG_PCMCIA) | 567 | #if IS_ENABLED(CONFIG_PCMCIA) |
562 | int comedi_pcmcia_driver_register(struct comedi_driver *comedi_driver, | 568 | int comedi_pcmcia_driver_register(struct comedi_driver *comedi_driver, |
563 | struct pcmcia_driver *pcmcia_driver) | 569 | struct pcmcia_driver *pcmcia_driver) |