This driver is configured with a Kconfig option that is
declared as a bool. Hence it is not possible for the code
to be built as modular. However the code is currently using
the module_platform_driver() macro for driver registration.
While this currently works, we really don't want to be including
the module.h header in non-modular code, which we'll be forced
to do, pending some upcoming code relocation from init.h into
module.h. So we fix it now by using the non-modular equivalent.
With some macro detangulation, and a little help from cpp, we can
see that module_platform_driver(goldfish_pdev_bus_driver) gets
roughly translated into:
static int __init goldfish_pdev_bus_driver_init(void)
{
return platform_driver_register(&goldfish_pdev_bus_driver);
}
module_init(goldfish_pdev_bus_driver_init);
static void __exit goldfish_pdev_bus_driver_exit(void)
{
platform_driver_unregister(&goldfish_pdev_bus_driver);
}
module_exit(goldfish_pdev_bus_driver_exit);
And since we've already established that the code is non-modular,
we can completely drop any code relating to module_exit. For non
modular code, module_init beomes __initcall. But direct use of
__initcall is discouraged, vs. one of the priority categorized
subgroups. As __initcall gets mapped onto device_initcall, our
use of device_initcall directly in this change means that the
runtime impact is zero -- they will remain at level 6 in the
initcall ordering.
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/platform/goldfish/pdev_bus.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/platform/goldfish/pdev_bus.c
b/drivers/platform/goldfish/pdev_bus.c
index 92cc4cf..e4e999f 100644
--- a/drivers/platform/goldfish/pdev_bus.c
+++ b/drivers/platform/goldfish/pdev_bus.c
@@ -221,20 +221,15 @@ free_resources:
return ret;
}
-static int goldfish_pdev_bus_remove(struct platform_device *pdev)
-{
- iounmap(pdev_bus_base);
- free_irq(pdev_bus_irq, pdev);
- release_mem_region(pdev_bus_addr, pdev_bus_len);
- return 0;
-}
-
static struct platform_driver goldfish_pdev_bus_driver = {
.probe = goldfish_pdev_bus_probe,
- .remove = goldfish_pdev_bus_remove,
.driver = {
.name = "goldfish_pdev_bus"
}
};
-module_platform_driver(goldfish_pdev_bus_driver);
+static int __init goldfish_pdev_bus_driver_init(void)
+{
+ return platform_driver_register(&goldfish_pdev_bus_driver);
+}
+device_initcall(goldfish_pdev_bus_driver_init);
--
1.8.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
