Commit 5e16fabe authored by Sylvain Munaut's avatar Sylvain Munaut Committed by Greg Kroah-Hartman
Browse files

ohci: Rework bus glue integration to allow several at once 



The previous model had the module_init & module_exit function in the
bus glue .c files themselves. That's a problem if several glues need
to be selected at once and the driver is built has module. This case
is quite common in embedded system where you want to handle both the
integrated ohci controller and some extra controller on PCI.

The ohci-hcd.c file now provide the module_init & module_exit and
appropriate driver registering/unregistering is done conditionally,
using #ifdefs.

Signed-off-by: default avatarSylvain Munaut <tnt@246tNt.com>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ad55d71a

drivers/usb/host/ohci-at91.c

+0 −15
Original line number Diff line number Diff line
@@ -320,18 +320,3 @@ static struct platform_driver ohci_hcd_at91_driver = { 
	},

};

static int __init ohci_hcd_at91_init (void)

{

	if (usb_disabled())

		return -ENODEV;



	return platform_driver_register(&ohci_hcd_at91_driver);

}



static void __exit ohci_hcd_at91_cleanup (void)

{

	platform_driver_unregister(&ohci_hcd_at91_driver);

}



module_init (ohci_hcd_at91_init);

module_exit (ohci_hcd_at91_cleanup);

drivers/usb/host/ohci-au1xxx.c

+0 −16
Original line number Diff line number Diff line
@@ -345,19 +345,3 @@ static struct platform_driver ohci_hcd_au1xxx_driver = { 
	},

};

static int __init ohci_hcd_au1xxx_init (void)

{

	pr_debug (DRIVER_INFO " (Au1xxx)");

	pr_debug ("block sizes: ed %d td %d\n",

		sizeof (struct ed), sizeof (struct td));



	return platform_driver_register(&ohci_hcd_au1xxx_driver);

}



static void __exit ohci_hcd_au1xxx_cleanup (void)

{

	platform_driver_unregister(&ohci_hcd_au1xxx_driver);

}



module_init (ohci_hcd_au1xxx_init);

module_exit (ohci_hcd_au1xxx_cleanup);

drivers/usb/host/ohci-ep93xx.c

+0 −12
Original line number Diff line number Diff line
@@ -214,15 +214,3 @@ static struct platform_driver ohci_hcd_ep93xx_driver = { 
	},

};

static int __init ohci_hcd_ep93xx_init(void)

{

	return platform_driver_register(&ohci_hcd_ep93xx_driver);

}



static void __exit ohci_hcd_ep93xx_cleanup(void)

{

	platform_driver_unregister(&ohci_hcd_ep93xx_driver);

}



module_init(ohci_hcd_ep93xx_init);

module_exit(ohci_hcd_ep93xx_cleanup);

drivers/usb/host/ohci-hcd.c

+80 −12
Original line number Diff line number Diff line
@@ -855,63 +855,131 @@ MODULE_LICENSE ("GPL"); 


#ifdef CONFIG_PCI

#include "ohci-pci.c"

#define PCI_DRIVER		ohci_pci_driver

#endif



#ifdef CONFIG_SA1111

#include "ohci-sa1111.c"

#define SA1111_DRIVER		ohci_hcd_sa1111_driver

#endif



#ifdef CONFIG_ARCH_S3C2410

#include "ohci-s3c2410.c"

#define PLATFORM_DRIVER		ohci_hcd_s3c2410_driver

#endif



#ifdef CONFIG_ARCH_OMAP

#include "ohci-omap.c"

#define PLATFORM_DRIVER		ohci_hcd_omap_driver

#endif



#ifdef CONFIG_ARCH_LH7A404

#include "ohci-lh7a404.c"

#define PLATFORM_DRIVER		ohci_hcd_lh7a404_driver

#endif



#ifdef CONFIG_PXA27x

#include "ohci-pxa27x.c"

#define PLATFORM_DRIVER		ohci_hcd_pxa27x_driver

#endif



#ifdef CONFIG_ARCH_EP93XX

#include "ohci-ep93xx.c"

#define PLATFORM_DRIVER		ohci_hcd_ep93xx_driver

#endif



#ifdef CONFIG_SOC_AU1X00

#include "ohci-au1xxx.c"

#define PLATFORM_DRIVER		ohci_hcd_au1xxx_driver

#endif



#ifdef CONFIG_PNX8550

#include "ohci-pnx8550.c"

#define PLATFORM_DRIVER		ohci_hcd_pnx8550_driver

#endif



#ifdef CONFIG_USB_OHCI_HCD_PPC_SOC

#include "ohci-ppc-soc.c"

#define PLATFORM_DRIVER		ohci_hcd_ppc_soc_driver

#endif



#ifdef CONFIG_ARCH_AT91

#include "ohci-at91.c"

#define PLATFORM_DRIVER		ohci_hcd_at91_driver

#endif



#ifdef CONFIG_ARCH_PNX4008

#include "ohci-pnx4008.c"

#define PLATFORM_DRIVER		usb_hcd_pnx4008_driver

#endif



#if !(defined(CONFIG_PCI) \

      || defined(CONFIG_SA1111) \

      || defined(CONFIG_ARCH_S3C2410) \

      || defined(CONFIG_ARCH_OMAP) \

      || defined (CONFIG_ARCH_LH7A404) \

      || defined (CONFIG_PXA27x) \

      || defined (CONFIG_ARCH_EP93XX) \

      || defined (CONFIG_SOC_AU1X00) \

      || defined (CONFIG_USB_OHCI_HCD_PPC_SOC) \

      || defined (CONFIG_ARCH_AT91) \

      || defined (CONFIG_ARCH_PNX4008) \

	)



#if	!defined(PCI_DRIVER) &&		\

	!defined(PLATFORM_DRIVER) &&	\

	!defined(SA1111_DRIVER)

#error "missing bus glue for ohci-hcd"

#endif



static int __init ohci_hcd_mod_init(void)

{

	int retval = 0;

	int ls = 0;



	if (usb_disabled())

		return -ENODEV;



	printk (KERN_DEBUG "%s: " DRIVER_INFO "\n", hcd_name);

	pr_debug ("%s: block sizes: ed %Zd td %Zd\n", hcd_name,

		sizeof (struct ed), sizeof (struct td));



#ifdef PLATFORM_DRIVER

	retval = platform_driver_register(&PLATFORM_DRIVER);

	if (retval < 0)

		return retval;

	ls++;

#endif



#ifdef SA1111_DRIVER

	retval = sa1111_driver_register(&SA1111_DRIVER);

	if (retval < 0)

		goto error;

	ls++;

#endif



#ifdef PCI_DRIVER

	retval = pci_register_driver(&PCI_DRIVER);

	if (retval < 0)

		goto error;

	ls++;

#endif



	return retval;



	/* Error path */

error:

#ifdef PLATFORM_DRIVER

	if (ls--)

		platform_driver_unregister(&PLATFORM_DRIVER);

#endif

#ifdef SA1111_DRIVER

	if (ls--)

		sa1111_driver_unregister(&SA1111_DRIVER);

#endif

	return retval;

}

module_init(ohci_hcd_mod_init);



static void __exit ohci_hcd_mod_exit(void)

{

#ifdef PCI_DRIVER

	pci_unregister_driver(&PCI_DRIVER);

#endif

#ifdef SA1111_DRIVER

	sa1111_driver_unregister(&SA1111_DRIVER);

#endif

#ifdef PLATFORM_DRIVER

	platform_driver_unregister(&PLATFORM_DRIVER);

#endif

}

module_exit(ohci_hcd_mod_exit);

drivers/usb/host/ohci-lh7a404.c

+0 −16
Original line number Diff line number Diff line
@@ -251,19 +251,3 @@ static struct platform_driver ohci_hcd_lh7a404_driver = { 
	},

};

static int __init ohci_hcd_lh7a404_init (void)

{

	pr_debug (DRIVER_INFO " (LH7A404)");

	pr_debug ("block sizes: ed %d td %d\n",

		sizeof (struct ed), sizeof (struct td));



	return platform_driver_register(&ohci_hcd_lh7a404_driver);

}



static void __exit ohci_hcd_lh7a404_cleanup (void)

{

	platform_driver_unregister(&ohci_hcd_lh7a404_driver);

}



module_init (ohci_hcd_lh7a404_init);

module_exit (ohci_hcd_lh7a404_cleanup);

CRA Git | Maintained and supported by SUSTech CRA and CCSE