p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clk: mvebu: make cp110-system-controller explicitly non-modular 

The Kconfig currently controlling compilation of this code is:

drivers/clk/mvebu/Kconfig:config ARMADA_CP110_SYSCON
drivers/clk/mvebu/Kconfig:      bool

...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
is already contained at the top of the file in the comments.

Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: linux-clk@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
Paul Gortmaker 2016-07-04 17:12:13 -04:00 committed by Stephen Boyd
parent 9fe6942950
commit 7acf751ea5
1 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/clk/mvebu/cp110-system-controller.c
View File

@ -30,7 +30,7 @@
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <linux/mfd/syscon.h> #include <linux/mfd/syscon.h>
#include <linux/module.h> #include <linux/init.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
@ -368,46 +368,17 @@ static int cp110_syscon_clk_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int cp110_syscon_clk_remove(struct platform_device *pdev)
{
struct clk_hw **cp110_clks = platform_get_drvdata(pdev);
int i;
of_clk_del_provider(pdev->dev.of_node);
for (i = 0; i < CP110_MAX_GATABLE_CLOCKS; i++) {
struct clk_hw *hw = cp110_clks[CP110_MAX_CORE_CLOCKS + i];
if (hw)
cp110_unregister_gate(hw);
}
clk_hw_unregister_fixed_factor(cp110_clks[CP110_CORE_NAND]);
clk_hw_unregister_fixed_factor(cp110_clks[CP110_CORE_CORE]);
clk_hw_unregister_fixed_factor(cp110_clks[CP110_CORE_EIP]);
clk_hw_unregister_fixed_factor(cp110_clks[CP110_CORE_PPV2]);
clk_hw_unregister_fixed_rate(cp110_clks[CP110_CORE_APLL]);
return 0;
}
static const struct of_device_id cp110_syscon_of_match[] = { static const struct of_device_id cp110_syscon_of_match[] = {
{ .compatible = "marvell,cp110-system-controller0", }, { .compatible = "marvell,cp110-system-controller0", },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, armada8k_pcie_of_match);
static struct platform_driver cp110_syscon_driver = { static struct platform_driver cp110_syscon_driver = {
.probe = cp110_syscon_clk_probe, .probe = cp110_syscon_clk_probe,
.remove = cp110_syscon_clk_remove,
.driver = { .driver = {
.name = "marvell-cp110-system-controller0", .name = "marvell-cp110-system-controller0",
.of_match_table = cp110_syscon_of_match, .of_match_table = cp110_syscon_of_match,
.suppress_bind_attrs = true,
}, },
}; };
builtin_platform_driver(cp110_syscon_driver);
module_platform_driver(cp110_syscon_driver);
MODULE_DESCRIPTION("Marvell CP110 System Controller 0 driver");
MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>");
MODULE_LICENSE("GPL");