From c2f90a20c9166bf9effb064703903039a49324e3 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Wed, 23 Jan 2013 00:03:30 +0100 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/comedidev.h | 5 +---- 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, return comedi_auto_config(&pcidev->dev, driver, 0); } -static inline void comedi_pci_auto_unconfig(struct pci_dev *pcidev) -{ - comedi_auto_unconfig(&pcidev->dev); -} +void comedi_pci_auto_unconfig(struct pci_dev *pcidev); static inline int comedi_usb_auto_config(struct usb_interface *intf, 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, } EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister); +void comedi_pci_auto_unconfig(struct pci_dev *pcidev) +{ + comedi_auto_unconfig(&pcidev->dev); +} +EXPORT_SYMBOL_GPL(comedi_pci_auto_unconfig); + #if IS_ENABLED(CONFIG_PCMCIA) int comedi_pcmcia_driver_register(struct comedi_driver *comedi_driver, struct pcmcia_driver *pcmcia_driver) -- 2.30.2