lkml.org 
[lkml]   [2016]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/10] clk: sunxi: make clk-* explicitly non-modular
    Date
    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.

    Cc: Boris BREZILLON <boris.brezillon@free-electrons.com>
    Cc: Chen-Yu Tsai <wens@csie.org>
    Cc: "Emilio López" <emilio@elopez.com.ar>
    Cc: Michael Turquette <mturquette@baylibre.com>
    Cc: Stephen Boyd <sboyd@codeaurora.org>
    Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
    Cc: linux-clk@vger.kernel.org
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    drivers/clk/sunxi/clk-factors.c | 1 -
    drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 9 ++-------
    drivers/clk/sunxi/clk-sun6i-apb0.c | 9 ++-------
    drivers/clk/sunxi/clk-sun6i-ar100.c | 21 +++------------------
    drivers/clk/sunxi/clk-sun8i-apb0.c | 9 ++-------
    drivers/clk/sunxi/clk-sun9i-mmc.c | 28 +++-------------------------
    6 files changed, 12 insertions(+), 65 deletions(-)

    diff --git a/drivers/clk/sunxi/clk-factors.c b/drivers/clk/sunxi/clk-factors.c
    index ddefe9668863..dfe5e3e32d28 100644
    --- a/drivers/clk/sunxi/clk-factors.c
    +++ b/drivers/clk/sunxi/clk-factors.c
    @@ -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>
    diff --git a/drivers/clk/sunxi/clk-sun6i-apb0-gates.c b/drivers/clk/sunxi/clk-sun6i-apb0-gates.c
    index 68021fa5ecd9..09cdb9874636 100644
    --- a/drivers/clk/sunxi/clk-sun6i-apb0-gates.c
    +++ b/drivers/clk/sunxi/clk-sun6i-apb0-gates.c
    @@ -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);
    diff --git a/drivers/clk/sunxi/clk-sun6i-apb0.c b/drivers/clk/sunxi/clk-sun6i-apb0.c
    index e703e1895b76..b9c8d359288c 100644
    --- a/drivers/clk/sunxi/clk-sun6i-apb0.c
    +++ b/drivers/clk/sunxi/clk-sun6i-apb0.c
    @@ -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);
    diff --git a/drivers/clk/sunxi/clk-sun6i-ar100.c b/drivers/clk/sunxi/clk-sun6i-ar100.c
    index 84a187e55360..64ca3e9e38e6 100644
    --- a/drivers/clk/sunxi/clk-sun6i-ar100.c
    +++ b/drivers/clk/sunxi/clk-sun6i-ar100.c
    @@ -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);
    diff --git a/drivers/clk/sunxi/clk-sun8i-apb0.c b/drivers/clk/sunxi/clk-sun8i-apb0.c
    index 2ea61debffc1..a5666e1d0ce7 100644
    --- a/drivers/clk/sunxi/clk-sun8i-apb0.c
    +++ b/drivers/clk/sunxi/clk-sun8i-apb0.c
    @@ -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);
    diff --git a/drivers/clk/sunxi/clk-sun9i-mmc.c b/drivers/clk/sunxi/clk-sun9i-mmc.c
    index 716737388b7d..6041bdba2e97 100644
    --- a/drivers/clk/sunxi/clk-sun9i-mmc.c
    +++ b/drivers/clk/sunxi/clk-sun9i-mmc.c
    @@ -16,7 +16,7 @@

    #include <linux/clk.h>
    #include <linux/clk-provider.h>
    -#include <linux/module.h>
    +#include <linux/init.h>
    #include <linux/of.h>
    #include <linux/of_device.h>
    #include <linux/reset.h>
    @@ -183,39 +183,17 @@ err_clk_register:
    return ret;
    }

    -static int sun9i_a80_mmc_config_clk_remove(struct platform_device *pdev)
    -{
    - struct device_node *np = pdev->dev.of_node;
    - struct sun9i_mmc_clk_data *data = platform_get_drvdata(pdev);
    - struct clk_onecell_data *clk_data = &data->clk_data;
    - int i;
    -
    - reset_controller_unregister(&data->rcdev);
    - of_clk_del_provider(np);
    - for (i = 0; i < clk_data->clk_num; i++)
    - clk_unregister(clk_data->clks[i]);
    -
    - reset_control_assert(data->reset);
    -
    - return 0;
    -}
    -
    static const struct of_device_id sun9i_a80_mmc_config_clk_dt_ids[] = {
    { .compatible = "allwinner,sun9i-a80-mmc-config-clk" },
    { /* sentinel */ }
    };
    -MODULE_DEVICE_TABLE(of, sun9i_a80_mmc_config_clk_dt_ids);

    static struct platform_driver sun9i_a80_mmc_config_clk_driver = {
    .driver = {
    .name = "sun9i-a80-mmc-config-clk",
    + .suppress_bind_attrs = true,
    .of_match_table = sun9i_a80_mmc_config_clk_dt_ids,
    },
    .probe = sun9i_a80_mmc_config_clk_probe,
    - .remove = sun9i_a80_mmc_config_clk_remove,
    };
    -module_platform_driver(sun9i_a80_mmc_config_clk_driver);
    -
    -MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
    -MODULE_DESCRIPTION("Allwinner A80 MMC clock/reset Driver");
    -MODULE_LICENSE("GPL v2");
    +builtin_platform_driver(sun9i_a80_mmc_config_clk_driver);
    --
    2.8.4
    \
     
     \ /
      Last update: 2016-07-05 00:01    [W:2.828 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site