Commit fdbde81b authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Linus Walleij

pinctrl: mvebu: make bool drivers explicitly non-modular

None of the Kconfigs for any of these drivers are tristate, meaning
that they currently are not 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 the exact same change, so they are handled in batch.

Changes are (1) use builtin_platform_driver, (2) dont use module.h
(3) delete module_exit related code, (4) delete MODULE_DEVICE_TABLE,
and (5) delete MODULE_LICENCE/MODULE_AUTHOR and associated tags.

For the dove driver 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 deleted the MODULE_LICENSE etc. tags since all that information
is already contained at the top of the file in the comments.

Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: linux-gpio@vger.kernel.org
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent cff1f7a9
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/of.h> #include <linux/of.h>
...@@ -406,9 +405,4 @@ static struct platform_driver armada_370_pinctrl_driver = { ...@@ -406,9 +405,4 @@ static struct platform_driver armada_370_pinctrl_driver = {
}, },
.probe = armada_370_pinctrl_probe, .probe = armada_370_pinctrl_probe,
}; };
builtin_platform_driver(armada_370_pinctrl_driver);
module_platform_driver(armada_370_pinctrl_driver);
MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>");
MODULE_DESCRIPTION("Marvell Armada 370 pinctrl driver");
MODULE_LICENSE("GPL v2");
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/of.h> #include <linux/of.h>
...@@ -424,9 +423,4 @@ static struct platform_driver armada_375_pinctrl_driver = { ...@@ -424,9 +423,4 @@ static struct platform_driver armada_375_pinctrl_driver = {
}, },
.probe = armada_375_pinctrl_probe, .probe = armada_375_pinctrl_probe,
}; };
builtin_platform_driver(armada_375_pinctrl_driver);
module_platform_driver(armada_375_pinctrl_driver);
MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>");
MODULE_DESCRIPTION("Marvell Armada 375 pinctrl driver");
MODULE_LICENSE("GPL v2");
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
...@@ -435,9 +434,4 @@ static struct platform_driver armada_38x_pinctrl_driver = { ...@@ -435,9 +434,4 @@ static struct platform_driver armada_38x_pinctrl_driver = {
}, },
.probe = armada_38x_pinctrl_probe, .probe = armada_38x_pinctrl_probe,
}; };
builtin_platform_driver(armada_38x_pinctrl_driver);
module_platform_driver(armada_38x_pinctrl_driver);
MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>");
MODULE_DESCRIPTION("Marvell Armada 38x pinctrl driver");
MODULE_LICENSE("GPL v2");
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
...@@ -417,9 +416,4 @@ static struct platform_driver armada_39x_pinctrl_driver = { ...@@ -417,9 +416,4 @@ static struct platform_driver armada_39x_pinctrl_driver = {
}, },
.probe = armada_39x_pinctrl_probe, .probe = armada_39x_pinctrl_probe,
}; };
builtin_platform_driver(armada_39x_pinctrl_driver);
module_platform_driver(armada_39x_pinctrl_driver);
MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>");
MODULE_DESCRIPTION("Marvell Armada 39x pinctrl driver");
MODULE_LICENSE("GPL v2");
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/of.h> #include <linux/of.h>
...@@ -650,9 +649,4 @@ static struct platform_driver armada_xp_pinctrl_driver = { ...@@ -650,9 +649,4 @@ static struct platform_driver armada_xp_pinctrl_driver = {
.suspend = armada_xp_pinctrl_suspend, .suspend = armada_xp_pinctrl_suspend,
.resume = armada_xp_pinctrl_resume, .resume = armada_xp_pinctrl_resume,
}; };
builtin_platform_driver(armada_xp_pinctrl_driver);
module_platform_driver(armada_xp_pinctrl_driver);
MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>");
MODULE_DESCRIPTION("Marvell Armada XP pinctrl driver");
MODULE_LICENSE("GPL v2");
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/clk.h> #include <linux/clk.h>
...@@ -854,24 +853,12 @@ static int dove_pinctrl_probe(struct platform_device *pdev) ...@@ -854,24 +853,12 @@ static int dove_pinctrl_probe(struct platform_device *pdev)
return mvebu_pinctrl_probe(pdev); return mvebu_pinctrl_probe(pdev);
} }
static int dove_pinctrl_remove(struct platform_device *pdev)
{
if (!IS_ERR(clk))
clk_disable_unprepare(clk);
return 0;
}
static struct platform_driver dove_pinctrl_driver = { static struct platform_driver dove_pinctrl_driver = {
.driver = { .driver = {
.name = "dove-pinctrl", .name = "dove-pinctrl",
.suppress_bind_attrs = true,
.of_match_table = dove_pinctrl_of_match, .of_match_table = dove_pinctrl_of_match,
}, },
.probe = dove_pinctrl_probe, .probe = dove_pinctrl_probe,
.remove = dove_pinctrl_remove,
}; };
builtin_platform_driver(dove_pinctrl_driver);
module_platform_driver(dove_pinctrl_driver);
MODULE_AUTHOR("Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>");
MODULE_DESCRIPTION("Marvell Dove pinctrl driver");
MODULE_LICENSE("GPL v2");
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/of.h> #include <linux/of.h>
...@@ -472,9 +471,4 @@ static struct platform_driver kirkwood_pinctrl_driver = { ...@@ -472,9 +471,4 @@ static struct platform_driver kirkwood_pinctrl_driver = {
}, },
.probe = kirkwood_pinctrl_probe, .probe = kirkwood_pinctrl_probe,
}; };
builtin_platform_driver(kirkwood_pinctrl_driver);
module_platform_driver(kirkwood_pinctrl_driver);
MODULE_AUTHOR("Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>");
MODULE_DESCRIPTION("Marvell Kirkwood pinctrl driver");
MODULE_LICENSE("GPL v2");
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
*/ */
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/of.h> #include <linux/of.h>
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/of.h> #include <linux/of.h>
...@@ -249,9 +248,4 @@ static struct platform_driver orion_pinctrl_driver = { ...@@ -249,9 +248,4 @@ static struct platform_driver orion_pinctrl_driver = {
}, },
.probe = orion_pinctrl_probe, .probe = orion_pinctrl_probe,
}; };
builtin_platform_driver(orion_pinctrl_driver);
module_platform_driver(orion_pinctrl_driver);
MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>");
MODULE_DESCRIPTION("Marvell Orion pinctrl driver");
MODULE_LICENSE("GPL v2");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment