The Kconfig currently controlling compilation of this code is:
drivers/reset/Kconfig: bool "Broadcom STB reset controller" if COMPILE_TEST
drivers/reset/Kconfig: default ARCH_BRCMSTB
...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.
We also delete no-op MODULE_LICENSE tag etc. since all that information
is already contained at the top of the file in the comments.
Cc: Philipp Zabel <[email protected]>
Cc: Brian Norris <[email protected]>
Cc: Gregory Fong <[email protected]>
Cc: Florian Fainelli <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
[Driver just recently appeared in linux-next - if rebasing, feel free
to squash this change into the original commit. Or make it tristate?]
drivers/reset/reset-brcmstb.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/reset/reset-brcmstb.c b/drivers/reset/reset-brcmstb.c
index 01ab1f71518b..5bc0c74cf97c 100644
--- a/drivers/reset/reset-brcmstb.c
+++ b/drivers/reset/reset-brcmstb.c
@@ -8,7 +8,7 @@
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/io.h>
-#include <linux/module.h>
+#include <linux/init.h>
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/reset-controller.h>
@@ -123,8 +123,4 @@ static struct platform_driver brcmstb_reset_driver = {
.of_match_table = brcmstb_reset_of_match,
},
};
-module_platform_driver(brcmstb_reset_driver);
-
-MODULE_AUTHOR("Broadcom");
-MODULE_DESCRIPTION("Broadcom STB reset controller");
-MODULE_LICENSE("GPL");
+builtin_platform_driver(brcmstb_reset_driver);
--
2.7.4
On 1/22/19 11:02 AM, Paul Gortmaker wrote:
> The Kconfig currently controlling compilation of this code is:
>
> drivers/reset/Kconfig: bool "Broadcom STB reset controller" if COMPILE_TEST
> drivers/reset/Kconfig: default ARCH_BRCMSTB
>
> ...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.
>
> We also delete no-op MODULE_LICENSE tag etc. since all that information
> is already contained at the top of the file in the comments.
>
> Cc: Philipp Zabel <[email protected]>
> Cc: Brian Norris <[email protected]>
> Cc: Gregory Fong <[email protected]>
> Cc: Florian Fainelli <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
> ---
>
> [Driver just recently appeared in linux-next - if rebasing, feel free
> to squash this change into the original commit. Or make it tristate?]
I would rather make it tristate indeed, there is another change I need
to submit, thanks!
>
> drivers/reset/reset-brcmstb.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/reset/reset-brcmstb.c b/drivers/reset/reset-brcmstb.c
> index 01ab1f71518b..5bc0c74cf97c 100644
> --- a/drivers/reset/reset-brcmstb.c
> +++ b/drivers/reset/reset-brcmstb.c
> @@ -8,7 +8,7 @@
> #include <linux/delay.h>
> #include <linux/device.h>
> #include <linux/io.h>
> -#include <linux/module.h>
> +#include <linux/init.h>
> #include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/reset-controller.h>
> @@ -123,8 +123,4 @@ static struct platform_driver brcmstb_reset_driver = {
> .of_match_table = brcmstb_reset_of_match,
> },
> };
> -module_platform_driver(brcmstb_reset_driver);
> -
> -MODULE_AUTHOR("Broadcom");
> -MODULE_DESCRIPTION("Broadcom STB reset controller");
> -MODULE_LICENSE("GPL");
> +builtin_platform_driver(brcmstb_reset_driver);
>
--
Florian