| Message ID | 20160703173040.23612-4-paul.gortmaker@windriver.com |
|---|---|
| State | Deferred |
| Headers | show |
Hi Paul, On 03/07/16 18:30, Paul Gortmaker wrote: > The Kconfig currently controlling compilation of this code is: > > drivers/bus/Kconfig:config TEGRA_ACONNECT > drivers/bus/Kconfig: bool "Tegra ACONNECT Bus 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_platform_driver() uses the same init level priority as > builtin_platform_driver() 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 > was (or is now) contained at the top of the file in the comments. In version 3 of the aconnect series [0] I had made this a tristate because we allowed it to be removed and you had submitted a patch to export the PM_CLK APIs. However, when discussing with Thierry he said that we were unable to merge with tristate because of the dependency on your patch. So he suggested we merge with bool for now and then change it back to tristate for v4.9. I understand that we should not do this, but we do plan to make this modular in the future. Cheers Jon [0] http://marc.info/?l=linux-tegra&m=146616753627760&w=2
diff --git a/drivers/bus/tegra-aconnect.c b/drivers/bus/tegra-aconnect.c index 7e4104b74fa8..f3982946ab8a 100644 --- a/drivers/bus/tegra-aconnect.c +++ b/drivers/bus/tegra-aconnect.c @@ -1,6 +1,8 @@ /* * Tegra ACONNECT Bus Driver * + * Author: Jon Hunter <jonathanh@nvidia.com> + * * Copyright (C) 2016, NVIDIA CORPORATION. All rights reserved. * * This file is subject to the terms and conditions of the GNU General Public @@ -9,7 +11,7 @@ */ #include <linux/clk.h> -#include <linux/module.h> +#include <linux/init.h> #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/pm_clock.h> @@ -66,15 +68,6 @@ clk_destroy: return ret; } -static int tegra_aconnect_remove(struct platform_device *pdev) -{ - pm_runtime_disable(&pdev->dev); - - pm_clk_destroy(&pdev->dev); - - return 0; -} - static int tegra_aconnect_runtime_resume(struct device *dev) { return pm_clk_resume(dev); @@ -94,19 +87,14 @@ static const struct of_device_id tegra_aconnect_of_match[] = { { .compatible = "nvidia,tegra210-aconnect", }, { } }; -MODULE_DEVICE_TABLE(of, tegra_aconnect_of_match); static struct platform_driver tegra_aconnect_driver = { .probe = tegra_aconnect_probe, - .remove = tegra_aconnect_remove, .driver = { .name = "tegra-aconnect", + .suppress_bind_attrs = true, .of_match_table = tegra_aconnect_of_match, .pm = &tegra_aconnect_pm_ops, }, }; -module_platform_driver(tegra_aconnect_driver); - -MODULE_DESCRIPTION("NVIDIA Tegra ACONNECT Bus Driver"); -MODULE_AUTHOR("Jon Hunter <jonathanh@nvidia.com>"); -MODULE_LICENSE("GPL v2"); +builtin_platform_driver(tegra_aconnect_driver);
The Kconfig currently controlling compilation of this code is: drivers/bus/Kconfig:config TEGRA_ACONNECT drivers/bus/Kconfig: bool "Tegra ACONNECT Bus 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_platform_driver() uses the same init level priority as builtin_platform_driver() 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 was (or is now) contained at the top of the file in the comments. Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Alexandre Courbot <gnurou@gmail.com> Cc: Jon Hunter <jonathanh@nvidia.com> Cc: linux-tegra@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- drivers/bus/tegra-aconnect.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-)