[12/27] kbuild, clk: remove MODULE_LICENSE in non-modules

Commit Message

Nick Alcock Feb. 22, 2023, 12:14 p.m. UTC

Since commit 8b41fc4454e ("kbuild: create modules.builtin without
Makefile.modbuiltin or tristate.conf"), MODULE_LICENSE declarations
are used to identify modules. As a consequence, uses of the macro
in non-modules will cause modprobe to misidentify their containing
object file as a module when it is not (false positives), and modprobe
might succeed rather than failing with a suitable error message.

So remove it in the files in this commit, none of which can be built as
modules.

Signed-off-by: Nick Alcock <[e-mail]>
Suggested-by: Luis Chamberlain <[e-mail]>
Cc: Luis Chamberlain <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Cc: Hitomi Hasegawa <[e-mail]>
Cc: Michael Turquette <[e-mail]>
Cc: Stephen Boyd <[e-mail]>
Cc: [e-mail]
---
 drivers/clk/clk-fixed-mmio.c         | 1 -
 drivers/clk/clk-fsl-sai.c            | 1 -
 drivers/clk/hisilicon/clk-hi3559a.c  | 1 -
 drivers/clk/microchip/clk-mpfs-ccc.c | 1 -
 4 files changed, 4 deletions(-)

Comments

Conor Dooley Feb. 22, 2023, 12:41 p.m. UTC | #1

On Wed, Feb 22, 2023 at 12:14:38PM +0000, Nick Alcock wrote:
> Since commit 8b41fc4454e ("kbuild: create modules.builtin without
> Makefile.modbuiltin or tristate.conf"), MODULE_LICENSE declarations
> are used to identify modules. As a consequence, uses of the macro
> in non-modules will cause modprobe to misidentify their containing
> object file as a module when it is not (false positives), and modprobe
> might succeed rather than failing with a suitable error message.
> 
> So remove it in the files in this commit, none of which can be built as
> modules.
> 
> Signed-off-by: Nick Alcock <[e-mail]>
> Suggested-by: Luis Chamberlain <[e-mail]>
> Cc: Luis Chamberlain <[e-mail]>
> Cc: [e-mail]
> Cc: [e-mail]
> Cc: Hitomi Hasegawa <[e-mail]>
> Cc: Michael Turquette <[e-mail]>
> Cc: Stephen Boyd <[e-mail]>
> Cc: [e-mail]

>  drivers/clk/microchip/clk-mpfs-ccc.c | 1 -

Reviewed-by: Conor Dooley <[e-mail]>
And since there's no reason to have this split via the at91 tree:
Acked-by: Conor Dooley <[e-mail]>

Clearly there's a hole in my maintainers entry for this driver, I'll go
fix that.

Stephen Boyd March 6, 2023, 7:29 p.m. UTC | #2

Quoting Nick Alcock (2023-02-22 04:14:38)
> Since commit 8b41fc4454e ("kbuild: create modules.builtin without
> Makefile.modbuiltin or tristate.conf"), MODULE_LICENSE declarations
> are used to identify modules. As a consequence, uses of the macro
> in non-modules will cause modprobe to misidentify their containing
> object file as a module when it is not (false positives), and modprobe
> might succeed rather than failing with a suitable error message.
> 
> So remove it in the files in this commit, none of which can be built as
> modules.
> 
> Signed-off-by: Nick Alcock <[e-mail]>
> Suggested-by: Luis Chamberlain <[e-mail]>
> Cc: Luis Chamberlain <[e-mail]>
> Cc: [e-mail]
> Cc: [e-mail]
> Cc: Hitomi Hasegawa <[e-mail]>
> Cc: Michael Turquette <[e-mail]>
> Cc: Stephen Boyd <[e-mail]>
> Cc: [e-mail]
> ---

Applied to clk-fixes

Patch

diff --git a/drivers/clk/clk-fixed-mmio.c b/drivers/clk/clk-fixed-mmio.c
index 5225d17d6b3f..8609fca29cc4 100644
--- a/drivers/clk/clk-fixed-mmio.c
+++ b/drivers/clk/clk-fixed-mmio.c
@@ -99,4 +99,3 @@  module_platform_driver(of_fixed_mmio_clk_driver);
 
 MODULE_AUTHOR("Jan Kotas <[e-mail]>");
 MODULE_DESCRIPTION("Memory Mapped IO Fixed clock driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/clk/clk-fsl-sai.c b/drivers/clk/clk-fsl-sai.c
index 6238fcea0467..ee5baf993ff2 100644
--- a/drivers/clk/clk-fsl-sai.c
+++ b/drivers/clk/clk-fsl-sai.c
@@ -88,5 +88,4 @@  module_platform_driver(fsl_sai_clk_driver);
 
 MODULE_DESCRIPTION("Freescale SAI bitclock-as-a-clock driver");
 MODULE_AUTHOR("Michael Walle <[e-mail]>");
-MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:fsl-sai-clk");
diff --git a/drivers/clk/hisilicon/clk-hi3559a.c b/drivers/clk/hisilicon/clk-hi3559a.c
index 9ea1a80acbe8..8036bd8cbb0a 100644
--- a/drivers/clk/hisilicon/clk-hi3559a.c
+++ b/drivers/clk/hisilicon/clk-hi3559a.c
@@ -841,5 +841,4 @@  static void __exit hi3559av100_crg_exit(void)
 module_exit(hi3559av100_crg_exit);
 
 
-MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("HiSilicon Hi3559AV100 CRG Driver");
diff --git a/drivers/clk/microchip/clk-mpfs-ccc.c b/drivers/clk/microchip/clk-mpfs-ccc.c
index 32aae880a14f..6ee92c7925d7 100644
--- a/drivers/clk/microchip/clk-mpfs-ccc.c
+++ b/drivers/clk/microchip/clk-mpfs-ccc.c
@@ -293,4 +293,3 @@  module_exit(clk_ccc_exit);
 
 MODULE_DESCRIPTION("Microchip PolarFire SoC Clock Conditioning Circuitry Driver");
 MODULE_AUTHOR("Conor Dooley <[e-mail]>");
-MODULE_LICENSE("GPL");