aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-02-02 15:17:40 -0500
committerLinus Walleij <linus.walleij@linaro.org>2017-02-06 05:28:22 -0500
commitcff1f7a9a27d2562bc221d0506d30b459505649c (patch)
tree835384f134a8167fed798eda58f0a0ee44627887
parent1fe57d67e093d526d8206b071a086cd11a740945 (diff)
pinctrl: sunxi: make sun5i explicitly non-modular
We had all these corrected in commit 0c8c6ba00cbf ("pinctrl: sunxi: make bool drivers explicitly non-modular") but this new one recently crept in. The Kconfig currently controlling compilation of this code is: drivers/pinctrl/sunxi/Kconfig:config PINCTRL_SUN5I drivers/pinctrl/sunxi/Kconfig: def_bool MACH_SUN5I ...meaning that it currently is not being built as a module by anyone. Lets remove the couple traces of modular infrastructure use, so that when reading the driver there is no doubt it is builtin-only. 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: Linus Walleij <linus.walleij@linaro.org> Cc: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: linux-gpio@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/sunxi/pinctrl-sun5i.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun5i.c b/drivers/pinctrl/sunxi/pinctrl-sun5i.c
index c7d44eeae704..47afd558b114 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun5i.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun5i.c
@@ -4,12 +4,12 @@
4 * Copyright (C) 2014-2016 Maxime Ripard <maxime.ripard@free-electrons.com> 4 * Copyright (C) 2014-2016 Maxime Ripard <maxime.ripard@free-electrons.com>
5 * Copyright (C) 2016 Mylene Josserand <mylene.josserand@free-electrons.com> 5 * Copyright (C) 2016 Mylene Josserand <mylene.josserand@free-electrons.com>
6 * 6 *
7g * This file is licensed under the terms of the GNU General Public 7 * This file is licensed under the terms of the GNU General Public
8 * License version 2. This program is licensed "as is" without any 8 * License version 2. This program is licensed "as is" without any
9 * warranty of any kind, whether express or implied. 9 * warranty of any kind, whether express or implied.
10 */ 10 */
11 11
12#include <linux/module.h> 12#include <linux/init.h>
13#include <linux/platform_device.h> 13#include <linux/platform_device.h>
14#include <linux/of.h> 14#include <linux/of.h>
15#include <linux/of_device.h> 15#include <linux/of_device.h>
@@ -738,7 +738,6 @@ static const struct of_device_id sun5i_pinctrl_match[] = {
738 }, 738 },
739 { }, 739 { },
740}; 740};
741MODULE_DEVICE_TABLE(of, sun5i_pinctrl_match);
742 741
743static struct platform_driver sun5i_pinctrl_driver = { 742static struct platform_driver sun5i_pinctrl_driver = {
744 .probe = sun5i_pinctrl_probe, 743 .probe = sun5i_pinctrl_probe,
@@ -747,8 +746,4 @@ static struct platform_driver sun5i_pinctrl_driver = {
747 .of_match_table = sun5i_pinctrl_match, 746 .of_match_table = sun5i_pinctrl_match,
748 }, 747 },
749}; 748};
750module_platform_driver(sun5i_pinctrl_driver); 749builtin_platform_driver(sun5i_pinctrl_driver);
751
752MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
753MODULE_DESCRIPTION("Allwinner sun5i pinctrl driver");
754MODULE_LICENSE("GPL");