Re: mmotm 2014-01-02-14-35 uploaded (musb)

[Felipe Balbi]

On Fri, Jan 03, 2014 at 09:57:50AM -0800, Randy Dunlap wrote:
> On 01/02/14 14:36, akpm@xxxxxxxxxxxxxxxxxxxx wrote:
> > The mm-of-the-moment snapshot 2014-01-02-14-35 has been uploaded to
> > 
> >    http://www.ozlabs.org/~akpm/mmotm/
> > 
> > mmotm-readme.txt says
> > 
> > README for mm-of-the-moment:
> > 
> > http://www.ozlabs.org/~akpm/mmotm/
> > 
> > This is a snapshot of my -mm patch queue.  Uploaded at random hopefully
> > more than once a week.
> 
> on x86_64:
> 
> when CONFIG_USB is not enabled:
> 
> drivers/built-in.o: In function `musb_init':
> musb_core.c:(.init.text+0x45fc): undefined reference to `usb_disabled'

already have a patch for that. Waiting for Greg to merge ;-)

commit 89f836a8c56bfea6585a09f7afff7094968a4fd0
Author: Ezequiel Garcia <ezequiel.garcia@xxxxxxxxxxxxxxxxxx>
Date:   Thu Dec 26 09:24:52 2013 -0300

    usb: musb: Remove usb_disable() check in module_init()
    
    Removing the check to usb_disable() before registering the platform
    driver allows to build this driver when !USB && USB_GADGET, to be
    used in gadget-only mode.
    
    Also, use module_platform_driver() to register the platform driver.
    
    Signed-off-by: Ezequiel Garcia <ezequiel.garcia@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Felipe Balbi <balbi@xxxxxx>

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 0e7f4a0..5942f00 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2325,19 +2325,4 @@ static struct platform_driver musb_driver = {
 	.shutdown	= musb_shutdown,
 };
 
-/*-------------------------------------------------------------------------*/
-
-static int __init musb_init(void)
-{
-	if (usb_disabled())
-		return 0;
-
-	return platform_driver_register(&musb_driver);
-}
-module_init(musb_init);
-
-static void __exit musb_cleanup(void)
-{
-	platform_driver_unregister(&musb_driver);
-}
-module_exit(musb_cleanup);
+module_platform_driver(musb_driver);

-- 
balbi

Attachment: signature.asc
Description: Digital signature