Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ef1a927 authored by Tobias Klauser's avatar Tobias Klauser Committed by Greg Kroah-Hartman
Browse files

usb: sl811-hcd: Convert to module_platform_driver 



Use the module_platform_driver macro, move the usb_disabled() check to
the probe function and get rid of the rather pointless message on module
load.

Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 42791480

drivers/usb/host/sl811-hcd.c

+4 −17
Original line number Diff line number Diff line
@@ -1632,6 +1632,9 @@ sl811h_probe(struct platform_device *dev) 
	u8			tmp, ioaddr = 0;

	unsigned long		irqflags;



	if (usb_disabled())

		return -ENODEV;



	/* basic sanity checks first.  board-specific init logic should

	 * have initialized these three resources and probably board

	 * specific platform_data.  we don't probe for IRQs, and do only
@@ -1817,20 +1820,4 @@ struct platform_driver sl811h_driver = { 
};

EXPORT_SYMBOL(sl811h_driver);



/*-------------------------------------------------------------------------*/



static int __init sl811h_init(void)

{

	if (usb_disabled())

		return -ENODEV;



	INFO("driver %s, %s\n", hcd_name, DRIVER_VERSION);

	return platform_driver_register(&sl811h_driver);

}

module_init(sl811h_init);



static void __exit sl811h_cleanup(void)

{

	platform_driver_unregister(&sl811h_driver);

}

module_exit(sl811h_cleanup);
 
module_platform_driver(sl811h_driver);