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

Commit 439a36d7 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Michael Turquette
Browse files

clk: sunxi: make clk-* explicitly non-modular 



We have the following file --> Kconfig mapping:

sunxi/clk-factors.c              obj-y
sunxi/clk-sun6i-apb0-gates.c     CONFIG_MFD_SUN6I_PRCM (bool)
sunxi/clk-sun6i-apb0.c           CONFIG_MFD_SUN6I_PRCM
sunxi/clk-sun6i-ar100.c          CONFIG_MFD_SUN6I_PRCM
sunxi/clk-sun8i-apb0.c           CONFIG_MFD_SUN6I_PRCM
sunxi/clk-sun9i-mmc.c            obj-y

Hence none of these are being built as a module by anyone.

Lets remove the modular code that is essentially orphaned, so that
when reading the drivers there is no doubt they are builtin-only.  All
drivers get mostly the same changes, so they are handled in batch.

Changes are (1) convert to builtin_platform_register, (2) use the
init.h header, (3) delete the MODULE_LICENCE/MODULE_AUTHOR and
associated tags, and (4) delete any ".remove" functions.

There was a stray module.h in a file not using any init.h or
module.h stuff, so we simply removed that one.

In two cases, 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.

We delete the MODULE_LICENSE etc. tags since all that information
is already contained at the top of each file in the comments.

Acked-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: "Emilio López" <emilio@elopez.com.ar>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Cc: linux-clk@vger.kernel.org
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarMichael Turquette <mturquette@baylibre.com>
Link: lkml.kernel.org/r/20160704211220.5685-9-paul.gortmaker@windriver.com
parent 80c6397c

drivers/clk/sunxi/clk-factors.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/delay.h>

#include <linux/err.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/of_address.h>

#include <linux/slab.h>

#include <linux/string.h>

drivers/clk/sunxi/clk-sun6i-apb0-gates.c

+2 −7
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 */



#include <linux/clk-provider.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>
@@ -33,7 +33,6 @@ static const struct of_device_id sun6i_a31_apb0_gates_clk_dt_ids[] = { 
	{ .compatible = "allwinner,sun8i-a23-apb0-gates-clk", .data = &sun8i_a23_apb0_gates },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, sun6i_a31_apb0_gates_clk_dt_ids);



static int sun6i_a31_apb0_gates_clk_probe(struct platform_device *pdev)

{
@@ -102,8 +101,4 @@ static struct platform_driver sun6i_a31_apb0_gates_clk_driver = { 
	},

	.probe = sun6i_a31_apb0_gates_clk_probe,

};

module_platform_driver(sun6i_a31_apb0_gates_clk_driver);



MODULE_AUTHOR("Boris BREZILLON <boris.brezillon@free-electrons.com>");

MODULE_DESCRIPTION("Allwinner A31 APB0 gate clocks driver");

MODULE_LICENSE("GPL v2");
 
builtin_platform_driver(sun6i_a31_apb0_gates_clk_driver);

drivers/clk/sunxi/clk-sun6i-apb0.c

+2 −7
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 */



#include <linux/clk-provider.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/of.h>

#include <linux/platform_device.h>
@@ -61,7 +61,6 @@ static const struct of_device_id sun6i_a31_apb0_clk_dt_ids[] = { 
	{ .compatible = "allwinner,sun6i-a31-apb0-clk" },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, sun6i_a31_apb0_clk_dt_ids);



static struct platform_driver sun6i_a31_apb0_clk_driver = {

	.driver = {
@@ -70,8 +69,4 @@ static struct platform_driver sun6i_a31_apb0_clk_driver = { 
	},

	.probe = sun6i_a31_apb0_clk_probe,

};

module_platform_driver(sun6i_a31_apb0_clk_driver);



MODULE_AUTHOR("Boris BREZILLON <boris.brezillon@free-electrons.com>");

MODULE_DESCRIPTION("Allwinner A31 APB0 clock Driver");

MODULE_LICENSE("GPL v2");
 
builtin_platform_driver(sun6i_a31_apb0_clk_driver);

drivers/clk/sunxi/clk-sun6i-ar100.c

+3 −18
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


#include <linux/bitops.h>

#include <linux/clk-provider.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/spinlock.h>
@@ -91,32 +91,17 @@ static int sun6i_a31_ar100_clk_probe(struct platform_device *pdev) 
	return 0;

}



static int sun6i_a31_ar100_clk_remove(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	struct clk *clk = platform_get_drvdata(pdev);



	sunxi_factors_unregister(np, clk);



	return 0;

}



static const struct of_device_id sun6i_a31_ar100_clk_dt_ids[] = {

	{ .compatible = "allwinner,sun6i-a31-ar100-clk" },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, sun6i_a31_ar100_clk_dt_ids);



static struct platform_driver sun6i_a31_ar100_clk_driver = {

	.driver = {

		.name = "sun6i-a31-ar100-clk",

		.of_match_table = sun6i_a31_ar100_clk_dt_ids,

		.suppress_bind_attrs = true,

	},

	.probe = sun6i_a31_ar100_clk_probe,

	.remove = sun6i_a31_ar100_clk_remove,

};

module_platform_driver(sun6i_a31_ar100_clk_driver);



MODULE_AUTHOR("Boris BREZILLON <boris.brezillon@free-electrons.com>");

MODULE_DESCRIPTION("Allwinner A31 AR100 clock Driver");

MODULE_LICENSE("GPL v2");
 
builtin_platform_driver(sun6i_a31_ar100_clk_driver);

drivers/clk/sunxi/clk-sun8i-apb0.c

+2 −7
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */



#include <linux/clk-provider.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/platform_device.h>
@@ -108,7 +108,6 @@ static const struct of_device_id sun8i_a23_apb0_clk_dt_ids[] = { 
	{ .compatible = "allwinner,sun8i-a23-apb0-clk" },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, sun8i_a23_apb0_clk_dt_ids);



static struct platform_driver sun8i_a23_apb0_clk_driver = {

	.driver = {
@@ -117,8 +116,4 @@ static struct platform_driver sun8i_a23_apb0_clk_driver = { 
	},

	.probe = sun8i_a23_apb0_clk_probe,

};

module_platform_driver(sun8i_a23_apb0_clk_driver);



MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");

MODULE_DESCRIPTION("Allwinner A23 APB0 clock Driver");

MODULE_LICENSE("GPL v2");
 
builtin_platform_driver(sun8i_a23_apb0_clk_driver);