@@ -7,7 +7,7 @@
* Author: Roger Quadros <rogerq@ti.com>
*/
#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/delay.h>
@@ -803,28 +803,6 @@ static int usbhs_omap_probe(struct platform_device *pdev)
return ret;
}
-static int usbhs_omap_remove_child(struct device *dev, void *data)
-{
- dev_info(dev, "unregistering\n");
- platform_device_unregister(to_platform_device(dev));
- return 0;
-}
-
-/**
- * usbhs_omap_remove - shutdown processing for UHH & TLL HCDs
- * @pdev: USB Host Controller being removed
- *
- * Reverses the effect of usbhs_omap_probe().
- */
-static int usbhs_omap_remove(struct platform_device *pdev)
-{
- pm_runtime_disable(&pdev->dev);
-
- /* remove children */
- device_for_each_child(&pdev->dev, NULL, usbhs_omap_remove_child);
- return 0;
-}
-
static const struct dev_pm_ops usbhsomap_dev_pm_ops = {
.runtime_suspend = usbhs_runtime_suspend,
.runtime_resume = usbhs_runtime_resume,
@@ -835,25 +813,16 @@ static const struct of_device_id usbhs_omap_dt_ids[] = {
{ }
};
-MODULE_DEVICE_TABLE(of, usbhs_omap_dt_ids);
-
-
static struct platform_driver usbhs_omap_driver = {
.driver = {
- .name = (char *)usbhs_driver_name,
- .pm = &usbhsomap_dev_pm_ops,
- .of_match_table = usbhs_omap_dt_ids,
+ .name = (char *)usbhs_driver_name,
+ .pm = &usbhsomap_dev_pm_ops,
+ .of_match_table = usbhs_omap_dt_ids,
+ .suppress_bind_attr = true,
},
.probe = usbhs_omap_probe,
- .remove = usbhs_omap_remove,
};
-MODULE_AUTHOR("Keshava Munegowda <keshava_mgowda@ti.com>");
-MODULE_AUTHOR("Roger Quadros <rogerq@ti.com>");
-MODULE_ALIAS("platform:" USBHS_DRIVER_NAME);
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("usb host common core driver for omap EHCI and OHCI");
-
static int omap_usbhs_drvinit(void)
{
return platform_driver_register(&usbhs_omap_driver);
@@ -867,9 +836,3 @@ static int omap_usbhs_drvinit(void)
* usb tll driver
*/
fs_initcall_sync(omap_usbhs_drvinit);
-
-static void omap_usbhs_drvexit(void)
-{
- platform_driver_unregister(&usbhs_omap_driver);
-}
-module_exit(omap_usbhs_drvexit);
The Kconfig currently controlling compilation of this code is: drivers/mfd/Kconfig:config MFD_OMAP_USB_HOST drivers/mfd/Kconfig: bool "TI OMAP USBHS core and TLL driver" ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. We explicitly disallow a driver unbind, since that doesn't have a sensible use case anyway, and it allows us to drop the ".remove" code for non-modular drivers. Since module_init was not in use by this code, the init ordering remains unchanged with this commit. Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. We also delete the MODULE_LICENSE tag etc. since all that information is already contained at the top of the file in the comments. Cc: Tony Lindgren <tony@atomide.com> Cc: Lee Jones <lee.jones@linaro.org> Cc: Keshava Munegowda <keshava_mgowda@ti.com> Cc: Roger Quadros <rogerq@ti.com> Cc: linux-omap@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- drivers/mfd/omap-usb-host.c | 47 +++++---------------------------------------- 1 file changed, 5 insertions(+), 42 deletions(-)