Commit 581a7dde authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: use inlines for PCI/USB auto config

Apart from the somewhat unnecessary `BUG_ON()` calls,
`comedi_pci_auto_config()` and `comedi_usb_auto_config()` are just
one-line wrappers around `comedi_auto_config()`, and
`comedi_pci_auto_unconfig()` and `comedi_usb_auto_unconfig()` are just
one-line wrappers around `comedi_auto_unconfig()`.  Convert them to
inline functions and remove the `BUG_ON()` calls.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ddbd0299
...@@ -517,11 +517,27 @@ void comedi_free_subdevice_minor(struct comedi_subdevice *s); ...@@ -517,11 +517,27 @@ void comedi_free_subdevice_minor(struct comedi_subdevice *s);
int comedi_auto_config(struct device *hardware_device, int comedi_auto_config(struct device *hardware_device,
struct comedi_driver *driver, unsigned long context); struct comedi_driver *driver, unsigned long context);
void comedi_auto_unconfig(struct device *hardware_device); void comedi_auto_unconfig(struct device *hardware_device);
int comedi_pci_auto_config(struct pci_dev *pcidev,
struct comedi_driver *driver); static inline int comedi_pci_auto_config(struct pci_dev *pcidev,
void comedi_pci_auto_unconfig(struct pci_dev *pcidev); struct comedi_driver *driver)
int comedi_usb_auto_config(struct usb_interface *intf, {
struct comedi_driver *driver); return comedi_auto_config(&pcidev->dev, driver, 0);
void comedi_usb_auto_unconfig(struct usb_interface *intf); }
static inline void comedi_pci_auto_unconfig(struct pci_dev *pcidev)
{
comedi_auto_unconfig(&pcidev->dev);
}
static inline int comedi_usb_auto_config(struct usb_interface *intf,
struct comedi_driver *driver)
{
return comedi_auto_config(&intf->dev, driver, 0);
}
static inline void comedi_usb_auto_unconfig(struct usb_interface *intf)
{
comedi_auto_unconfig(&intf->dev);
}
#endif /* _COMEDIDEV_H */ #endif /* _COMEDIDEV_H */
...@@ -930,18 +930,6 @@ void comedi_pci_disable(struct pci_dev *pdev) ...@@ -930,18 +930,6 @@ void comedi_pci_disable(struct pci_dev *pdev)
} }
EXPORT_SYMBOL_GPL(comedi_pci_disable); EXPORT_SYMBOL_GPL(comedi_pci_disable);
int comedi_pci_auto_config(struct pci_dev *pcidev, struct comedi_driver *driver)
{
return comedi_auto_config(&pcidev->dev, driver, 0);
}
EXPORT_SYMBOL_GPL(comedi_pci_auto_config);
void comedi_pci_auto_unconfig(struct pci_dev *pcidev)
{
comedi_auto_unconfig(&pcidev->dev);
}
EXPORT_SYMBOL_GPL(comedi_pci_auto_unconfig);
int comedi_pci_driver_register(struct comedi_driver *comedi_driver, int comedi_pci_driver_register(struct comedi_driver *comedi_driver,
struct pci_driver *pci_driver) struct pci_driver *pci_driver)
{ {
...@@ -975,21 +963,6 @@ EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister); ...@@ -975,21 +963,6 @@ EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister);
#if IS_ENABLED(CONFIG_USB) #if IS_ENABLED(CONFIG_USB)
int comedi_usb_auto_config(struct usb_interface *intf,
struct comedi_driver *driver)
{
BUG_ON(intf == NULL);
return comedi_auto_config(&intf->dev, driver, 0);
}
EXPORT_SYMBOL_GPL(comedi_usb_auto_config);
void comedi_usb_auto_unconfig(struct usb_interface *intf)
{
BUG_ON(intf == NULL);
comedi_auto_unconfig(&intf->dev);
}
EXPORT_SYMBOL_GPL(comedi_usb_auto_unconfig);
int comedi_usb_driver_register(struct comedi_driver *comedi_driver, int comedi_usb_driver_register(struct comedi_driver *comedi_driver,
struct usb_driver *usb_driver) struct usb_driver *usb_driver)
{ {
......
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