lkml.org 
[lkml]   [2016]   [Feb]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/8] drivers/pinctrl: make sunxi/pinctrl-sun[4-9]* explicitly non-modular
    Date
    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) use init.h header
    (3) delete module_exit related code, (4) delete MODULE_DEVICE_TABLE,
    and (5) delete MODULE_LICENCE/MODULE_AUTHOR and associated tags.

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

    Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
    Cc: Chen-Yu Tsai <wens@csie.org>
    Cc: Hans de Goede <hdegoede@redhat.com>
    Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
    Cc: Vishnu Patekar <vishnupatekar0510@gmail.com>
    Cc: linux-gpio@vger.kernel.org
    Cc: linux-arm-kernel@lists.infradead.org
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 9 ++-------
    drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | 9 ++-------
    drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | 9 ++-------
    drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 10 ++--------
    drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 9 ++-------
    drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c | 9 ++-------
    drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c | 9 ++-------
    drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 11 ++---------
    drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c | 10 ++--------
    drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c | 9 ++-------
    drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 9 ++-------
    11 files changed, 22 insertions(+), 81 deletions(-)

    diff --git a/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c b/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
    index 862a096c5dba..fb30b86a97ee 100644
    --- a/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
    +++ b/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
    @@ -10,7 +10,7 @@
    * warranty of any kind, whether express or implied.
    */

    -#include <linux/module.h>
    +#include <linux/init.h>
    #include <linux/platform_device.h>
    #include <linux/of.h>
    #include <linux/of_device.h>
    @@ -1035,7 +1035,6 @@ static const struct of_device_id sun4i_a10_pinctrl_match[] = {
    { .compatible = "allwinner,sun4i-a10-pinctrl", },
    {}
    };
    -MODULE_DEVICE_TABLE(of, sun4i_a10_pinctrl_match);

    static struct platform_driver sun4i_a10_pinctrl_driver = {
    .probe = sun4i_a10_pinctrl_probe,
    @@ -1044,8 +1043,4 @@ static struct platform_driver sun4i_a10_pinctrl_driver = {
    .of_match_table = sun4i_a10_pinctrl_match,
    },
    };
    -module_platform_driver(sun4i_a10_pinctrl_driver);
    -
    -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
    -MODULE_DESCRIPTION("Allwinner A10 pinctrl driver");
    -MODULE_LICENSE("GPL");
    +builtin_platform_driver(sun4i_a10_pinctrl_driver);
    diff --git a/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c b/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c
    index f9a3f8f446f7..a5b57fdff9e1 100644
    --- a/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c
    +++ b/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c
    @@ -10,7 +10,7 @@
    * warranty of any kind, whether express or implied.
    */

    -#include <linux/module.h>
    +#include <linux/init.h>
    #include <linux/platform_device.h>
    #include <linux/of.h>
    #include <linux/of_device.h>
    @@ -674,7 +674,6 @@ static const struct of_device_id sun5i_a10s_pinctrl_match[] = {
    { .compatible = "allwinner,sun5i-a10s-pinctrl", },
    {}
    };
    -MODULE_DEVICE_TABLE(of, sun5i_a10s_pinctrl_match);

    static struct platform_driver sun5i_a10s_pinctrl_driver = {
    .probe = sun5i_a10s_pinctrl_probe,
    @@ -683,8 +682,4 @@ static struct platform_driver sun5i_a10s_pinctrl_driver = {
    .of_match_table = sun5i_a10s_pinctrl_match,
    },
    };
    -module_platform_driver(sun5i_a10s_pinctrl_driver);
    -
    -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
    -MODULE_DESCRIPTION("Allwinner A10s pinctrl driver");
    -MODULE_LICENSE("GPL");
    +builtin_platform_driver(sun5i_a10s_pinctrl_driver);
    diff --git a/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c b/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
    index 2bb07b38834f..8575f3f6d3dd 100644
    --- a/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
    +++ b/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
    @@ -10,7 +10,7 @@
    * warranty of any kind, whether express or implied.
    */

    -#include <linux/module.h>
    +#include <linux/init.h>
    #include <linux/platform_device.h>
    #include <linux/of.h>
    #include <linux/of_device.h>
    @@ -392,7 +392,6 @@ static const struct of_device_id sun5i_a13_pinctrl_match[] = {
    { .compatible = "allwinner,sun5i-a13-pinctrl", },
    {}
    };
    -MODULE_DEVICE_TABLE(of, sun5i_a13_pinctrl_match);

    static struct platform_driver sun5i_a13_pinctrl_driver = {
    .probe = sun5i_a13_pinctrl_probe,
    @@ -401,8 +400,4 @@ static struct platform_driver sun5i_a13_pinctrl_driver = {
    .of_match_table = sun5i_a13_pinctrl_match,
    },
    };
    -module_platform_driver(sun5i_a13_pinctrl_driver);
    -
    -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
    -MODULE_DESCRIPTION("Allwinner A13 pinctrl driver");
    -MODULE_LICENSE("GPL");
    +builtin_platform_driver(sun5i_a13_pinctrl_driver);
    diff --git a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
    index d4bc4f0e8be0..a22bd88a1f03 100644
    --- a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
    +++ b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
    @@ -12,7 +12,7 @@
    * warranty of any kind, whether express or implied.
    */

    -#include <linux/module.h>
    +#include <linux/init.h>
    #include <linux/platform_device.h>
    #include <linux/of.h>
    #include <linux/of_device.h>
    @@ -136,7 +136,6 @@ static const struct of_device_id sun6i_a31_r_pinctrl_match[] = {
    { .compatible = "allwinner,sun6i-a31-r-pinctrl", },
    {}
    };
    -MODULE_DEVICE_TABLE(of, sun6i_a31_r_pinctrl_match);

    static struct platform_driver sun6i_a31_r_pinctrl_driver = {
    .probe = sun6i_a31_r_pinctrl_probe,
    @@ -145,9 +144,4 @@ static struct platform_driver sun6i_a31_r_pinctrl_driver = {
    .of_match_table = sun6i_a31_r_pinctrl_match,
    },
    };
    -module_platform_driver(sun6i_a31_r_pinctrl_driver);
    -
    -MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
    -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
    -MODULE_DESCRIPTION("Allwinner A31 R_PIO pinctrl driver");
    -MODULE_LICENSE("GPL");
    +builtin_platform_driver(sun6i_a31_r_pinctrl_driver);
    diff --git a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
    index 022863ab0c58..508ec54897ae 100644
    --- a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
    +++ b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
    @@ -10,7 +10,7 @@
    * warranty of any kind, whether express or implied.
    */

    -#include <linux/module.h>
    +#include <linux/init.h>
    #include <linux/platform_device.h>
    #include <linux/of.h>
    #include <linux/of_device.h>
    @@ -926,7 +926,6 @@ static const struct of_device_id sun6i_a31_pinctrl_match[] = {
    { .compatible = "allwinner,sun6i-a31-pinctrl", },
    {}
    };
    -MODULE_DEVICE_TABLE(of, sun6i_a31_pinctrl_match);

    static struct platform_driver sun6i_a31_pinctrl_driver = {
    .probe = sun6i_a31_pinctrl_probe,
    @@ -935,8 +934,4 @@ static struct platform_driver sun6i_a31_pinctrl_driver = {
    .of_match_table = sun6i_a31_pinctrl_match,
    },
    };
    -module_platform_driver(sun6i_a31_pinctrl_driver);
    -
    -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
    -MODULE_DESCRIPTION("Allwinner A31 pinctrl driver");
    -MODULE_LICENSE("GPL");
    +builtin_platform_driver(sun6i_a31_pinctrl_driver);
    diff --git a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c
    index e570d5c93ecc..231a746a5356 100644
    --- a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c
    +++ b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c
    @@ -11,7 +11,7 @@
    * warranty of any kind, whether express or implied.
    */

    -#include <linux/module.h>
    +#include <linux/init.h>
    #include <linux/platform_device.h>
    #include <linux/of.h>
    #include <linux/of_device.h>
    @@ -798,7 +798,6 @@ static const struct of_device_id sun6i_a31s_pinctrl_match[] = {
    { .compatible = "allwinner,sun6i-a31s-pinctrl", },
    {}
    };
    -MODULE_DEVICE_TABLE(of, sun6i_a31s_pinctrl_match);

    static struct platform_driver sun6i_a31s_pinctrl_driver = {
    .probe = sun6i_a31s_pinctrl_probe,
    @@ -807,8 +806,4 @@ static struct platform_driver sun6i_a31s_pinctrl_driver = {
    .of_match_table = sun6i_a31s_pinctrl_match,
    },
    };
    -module_platform_driver(sun6i_a31s_pinctrl_driver);
    -
    -MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
    -MODULE_DESCRIPTION("Allwinner A31s pinctrl driver");
    -MODULE_LICENSE("GPL");
    +builtin_platform_driver(sun6i_a31s_pinctrl_driver);
    diff --git a/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c b/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
    index cf1ce0c02600..052f658c53c7 100644
    --- a/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
    +++ b/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
    @@ -10,7 +10,7 @@
    * warranty of any kind, whether express or implied.
    */

    -#include <linux/module.h>
    +#include <linux/init.h>
    #include <linux/platform_device.h>
    #include <linux/of.h>
    #include <linux/of_device.h>
    @@ -1049,7 +1049,6 @@ static const struct of_device_id sun7i_a20_pinctrl_match[] = {
    { .compatible = "allwinner,sun7i-a20-pinctrl", },
    {}
    };
    -MODULE_DEVICE_TABLE(of, sun7i_a20_pinctrl_match);

    static struct platform_driver sun7i_a20_pinctrl_driver = {
    .probe = sun7i_a20_pinctrl_probe,
    @@ -1058,8 +1057,4 @@ static struct platform_driver sun7i_a20_pinctrl_driver = {
    .of_match_table = sun7i_a20_pinctrl_match,
    },
    };
    -module_platform_driver(sun7i_a20_pinctrl_driver);
    -
    -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
    -MODULE_DESCRIPTION("Allwinner A20 pinctrl driver");
    -MODULE_LICENSE("GPL");
    +builtin_platform_driver(sun7i_a20_pinctrl_driver);
    diff --git a/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c b/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
    index 056287635873..2292e05a397b 100644
    --- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
    +++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
    @@ -15,7 +15,7 @@
    * warranty of any kind, whether express or implied.
    */

    -#include <linux/module.h>
    +#include <linux/init.h>
    #include <linux/platform_device.h>
    #include <linux/of.h>
    #include <linux/of_device.h>
    @@ -123,7 +123,6 @@ static const struct of_device_id sun8i_a23_r_pinctrl_match[] = {
    { .compatible = "allwinner,sun8i-a23-r-pinctrl", },
    {}
    };
    -MODULE_DEVICE_TABLE(of, sun8i_a23_r_pinctrl_match);

    static struct platform_driver sun8i_a23_r_pinctrl_driver = {
    .probe = sun8i_a23_r_pinctrl_probe,
    @@ -132,10 +131,4 @@ static struct platform_driver sun8i_a23_r_pinctrl_driver = {
    .of_match_table = sun8i_a23_r_pinctrl_match,
    },
    };
    -module_platform_driver(sun8i_a23_r_pinctrl_driver);
    -
    -MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
    -MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
    -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
    -MODULE_DESCRIPTION("Allwinner A23 R_PIO pinctrl driver");
    -MODULE_LICENSE("GPL");
    +builtin_platform_driver(sun8i_a23_r_pinctrl_driver);
    diff --git a/drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c b/drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c
    index 55083d278bb1..29d307b3c3ec 100644
    --- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c
    +++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c
    @@ -14,7 +14,7 @@
    * warranty of any kind, whether express or implied.
    */

    -#include <linux/module.h>
    +#include <linux/init.h>
    #include <linux/platform_device.h>
    #include <linux/of.h>
    #include <linux/of_device.h>
    @@ -575,7 +575,6 @@ static const struct of_device_id sun8i_a23_pinctrl_match[] = {
    { .compatible = "allwinner,sun8i-a23-pinctrl", },
    {}
    };
    -MODULE_DEVICE_TABLE(of, sun8i_a23_pinctrl_match);

    static struct platform_driver sun8i_a23_pinctrl_driver = {
    .probe = sun8i_a23_pinctrl_probe,
    @@ -584,9 +583,4 @@ static struct platform_driver sun8i_a23_pinctrl_driver = {
    .of_match_table = sun8i_a23_pinctrl_match,
    },
    };
    -module_platform_driver(sun8i_a23_pinctrl_driver);
    -
    -MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
    -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
    -MODULE_DESCRIPTION("Allwinner A23 pinctrl driver");
    -MODULE_LICENSE("GPL");
    +builtin_platform_driver(sun8i_a23_pinctrl_driver);
    diff --git a/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c b/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c
    index 00265f0435a7..9112922d9492 100644
    --- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c
    +++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c
    @@ -12,7 +12,7 @@
    * warranty of any kind, whether express or implied.
    */

    -#include <linux/module.h>
    +#include <linux/init.h>
    #include <linux/platform_device.h>
    #include <linux/of.h>
    #include <linux/of_device.h>
    @@ -497,7 +497,6 @@ static const struct of_device_id sun8i_a33_pinctrl_match[] = {
    { .compatible = "allwinner,sun8i-a33-pinctrl", },
    {}
    };
    -MODULE_DEVICE_TABLE(of, sun8i_a33_pinctrl_match);

    static struct platform_driver sun8i_a33_pinctrl_driver = {
    .probe = sun8i_a33_pinctrl_probe,
    @@ -506,8 +505,4 @@ static struct platform_driver sun8i_a33_pinctrl_driver = {
    .of_match_table = sun8i_a33_pinctrl_match,
    },
    };
    -module_platform_driver(sun8i_a33_pinctrl_driver);
    -
    -MODULE_AUTHOR("Vishnu Patekar <vishnupatekar0510@gmail.com>");
    -MODULE_DESCRIPTION("Allwinner a33 pinctrl driver");
    -MODULE_LICENSE("GPL");
    +builtin_platform_driver(sun8i_a33_pinctrl_driver);
    diff --git a/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c b/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c
    index 1b580ba76453..bc14e954d7a2 100644
    --- a/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c
    +++ b/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c
    @@ -10,7 +10,7 @@
    * warranty of any kind, whether express or implied.
    */

    -#include <linux/module.h>
    +#include <linux/init.h>
    #include <linux/platform_device.h>
    #include <linux/of.h>
    #include <linux/of_device.h>
    @@ -733,7 +733,6 @@ static const struct of_device_id sun9i_a80_pinctrl_match[] = {
    { .compatible = "allwinner,sun9i-a80-pinctrl", },
    {}
    };
    -MODULE_DEVICE_TABLE(of, sun9i_a80_pinctrl_match);

    static struct platform_driver sun9i_a80_pinctrl_driver = {
    .probe = sun9i_a80_pinctrl_probe,
    @@ -742,8 +741,4 @@ static struct platform_driver sun9i_a80_pinctrl_driver = {
    .of_match_table = sun9i_a80_pinctrl_match,
    },
    };
    -module_platform_driver(sun9i_a80_pinctrl_driver);
    -
    -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>");
    -MODULE_DESCRIPTION("Allwinner A80 pinctrl driver");
    -MODULE_LICENSE("GPL");
    +builtin_platform_driver(sun9i_a80_pinctrl_driver);
    --
    2.6.1
    \
     
     \ /
      Last update: 2016-02-29 22:21    [W:4.433 / U:0.992 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site