leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging/comedi: fix build for USB not enabled

Browse Source 
Calls to optional subsystems cannot be made indiscriminately.
Enclose all of the usb helper functions inside
#if IS_ENABLED(CONFIG_USB)
to fix these build errors.

(The pci helper functions are OK since there are stubs in
linux/pci.h for the called functions when PCI is not enabled.
Possibly the same could be done for the called USB functions.)

ERROR: "usb_deregister" [drivers/staging/comedi/comedi.ko] undefined!
ERROR: "usb_register_driver" [drivers/staging/comedi/comedi.ko] undefined!

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Randy Dunlap 2012-06-11 16:35:50 -07:00 committed by Greg Kroah-Hartman
parent afb6a6a01b
commit 78b10615ad
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/comedi/drivers.c
View File

@ -30,6 +30,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/kconfig.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/fcntl.h> #include <linux/fcntl.h>
@ -981,6 +982,8 @@ void comedi_pci_driver_unregister(struct comedi_driver *comedi_driver,
} }
EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister); EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister);
#if IS_ENABLED(CONFIG_USB)
static int comedi_old_usb_auto_config(struct usb_interface *intf, static int comedi_old_usb_auto_config(struct usb_interface *intf,
struct comedi_driver *driver) struct comedi_driver *driver)
{ {
@ -1043,3 +1046,5 @@ void comedi_usb_driver_unregister(struct comedi_driver *comedi_driver,
comedi_driver_unregister(comedi_driver); comedi_driver_unregister(comedi_driver);
} }
EXPORT_SYMBOL_GPL(comedi_usb_driver_unregister); EXPORT_SYMBOL_GPL(comedi_usb_driver_unregister);
#endif