lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb/xhci: remove CONFIG_PCI in xhci.c's probe function

Browse Source 
This removes the need of ifdefs within the init function and with it the
headache about the correct clean without bus X but with bus/platform Y &
Z.
xhci-pci is only compiled if CONFIG_PCI is selected which can be
de-selected now without trouble. For now the result is kinda useless
because we have no other glue code. However, since nobody is using
USB_ARCH_HAS_XHCI then it should not be an issue :)

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Sebastian Andrzej Siewior
2011-09-23 14:20:02 -07:00
committed by Greg Kroah-Hartman
parent 552e0c4f12
commit 0cc47d547d
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/host/Makefile
View File

@@ -11,8 +11,9 @@ fhci-y += fhci-mem.o fhci-tds.o fhci-sched.o
fhci-$(CONFIG_FHCI_DEBUG) += fhci-dbg.o fhci-$(CONFIG_FHCI_DEBUG) += fhci-dbg.o
xhci-hcd-y := xhci.o xhci-mem.o xhci-pci.o xhci-hcd-y := xhci.o xhci-mem.o
xhci-hcd-y += xhci-ring.o xhci-hub.o xhci-dbg.o xhci-hcd-y += xhci-ring.o xhci-hub.o xhci-dbg.o
xhci-hcd-$(CONFIG_PCI) += xhci-pci.o
obj-$(CONFIG_USB_WHCI_HCD) += whci/ obj-$(CONFIG_USB_WHCI_HCD) += whci/

4
drivers/usb/host/xhci-pci.c
View File

@@ -320,12 +320,12 @@ static struct pci_driver xhci_pci_driver = {
#endif #endif
}; };
int xhci_register_pci(void) int __init xhci_register_pci(void)
{ {
return pci_register_driver(&xhci_pci_driver); return pci_register_driver(&xhci_pci_driver);
} }
void xhci_unregister_pci(void) void __exit xhci_unregister_pci(void)
{ {
pci_unregister_driver(&xhci_pci_driver); pci_unregister_driver(&xhci_pci_driver);
} }

7
drivers/usb/host/xhci.c
View File

@@ -4039,16 +4039,13 @@ MODULE_LICENSE("GPL");
static int __init xhci_hcd_init(void) static int __init xhci_hcd_init(void)
{ {
#ifdef CONFIG_PCI int retval;
int retval = 0;
retval = xhci_register_pci(); retval = xhci_register_pci();
if (retval < 0) { if (retval < 0) {
printk(KERN_DEBUG "Problem registering PCI driver."); printk(KERN_DEBUG "Problem registering PCI driver.");
return retval; return retval;
} }
#endif
/* /*
* Check the compiler generated sizes of structures that must be laid * Check the compiler generated sizes of structures that must be laid
* out in specific ways for hardware access. * out in specific ways for hardware access.
@@ -4073,8 +4070,6 @@ module_init(xhci_hcd_init);
static void __exit xhci_hcd_cleanup(void) static void __exit xhci_hcd_cleanup(void)
{ {
#ifdef CONFIG_PCI
xhci_unregister_pci(); xhci_unregister_pci();
#endif
} }
module_exit(xhci_hcd_cleanup); module_exit(xhci_hcd_cleanup);

3
drivers/usb/host/xhci.h
View File

@@ -1644,6 +1644,9 @@ void xhci_free_command(struct xhci_hcd *xhci,
/* xHCI PCI glue */ /* xHCI PCI glue */
int xhci_register_pci(void); int xhci_register_pci(void);
void xhci_unregister_pci(void); void xhci_unregister_pci(void);
#else
static inline int xhci_register_pci(void) { return 0; }
static inline void xhci_unregister_pci(void) {}
#endif #endif
/* xHCI host controller glue */ /* xHCI host controller glue */