Commit 0cc47d54 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Greg Kroah-Hartman
Browse files

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



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: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 552e0c4f

drivers/usb/host/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -11,8 +11,9 @@ fhci-y += fhci-mem.o fhci-tds.o fhci-sched.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-$(CONFIG_PCI)	+= xhci-pci.o



obj-$(CONFIG_USB_WHCI_HCD)	+= whci/

drivers/usb/host/xhci-pci.c

+2 −2
Original line number Diff line number Diff line
@@ -320,12 +320,12 @@ static struct pci_driver xhci_pci_driver = { 
#endif

};



int xhci_register_pci(void)

int __init xhci_register_pci(void)

{

	return pci_register_driver(&xhci_pci_driver);

}



void xhci_unregister_pci(void)

void __exit xhci_unregister_pci(void)

{

	pci_unregister_driver(&xhci_pci_driver);

}

drivers/usb/host/xhci.c

+1 −6
Original line number Diff line number Diff line
@@ -4039,16 +4039,13 @@ MODULE_LICENSE("GPL"); 


static int __init xhci_hcd_init(void)

{

#ifdef CONFIG_PCI

	int retval = 0;

	int retval;



	retval = xhci_register_pci();



	if (retval < 0) {

		printk(KERN_DEBUG "Problem registering PCI driver.");

		return retval;

	}

#endif

	/*

	 * Check the compiler generated sizes of structures that must be laid

	 * out in specific ways for hardware access.
@@ -4073,8 +4070,6 @@ module_init(xhci_hcd_init); 


static void __exit xhci_hcd_cleanup(void)

{

#ifdef CONFIG_PCI

	xhci_unregister_pci();

#endif

}

module_exit(xhci_hcd_cleanup);

drivers/usb/host/xhci.h

+3 −0
Original line number Diff line number Diff line
@@ -1644,6 +1644,9 @@ void xhci_free_command(struct xhci_hcd *xhci, 
/* xHCI PCI glue */

int xhci_register_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



/* xHCI host controller glue */

CRA Git | Maintained and supported by SUSTech CRA and CCSE