[11/27] kbuild, clk: bcm2835: 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: Florian Fainelli <[e-mail]>
Cc: Ray Jui <[e-mail]>
Cc: Scott Branden <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
---
 drivers/clk/bcm/clk-bcm2835-aux.c | 1 -
 drivers/clk/bcm/clk-bcm2835.c     | 1 -
 2 files changed, 2 deletions(-)

Comments

Stephen Boyd Feb. 22, 2023, 11:43 p.m. UTC | #1

Quoting Nick Alcock (2023-02-22 04:14:37)
> 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: Florian Fainelli <[e-mail]>
> Cc: Ray Jui <[e-mail]>
> Cc: Scott Branden <[e-mail]>
> Cc: [e-mail]
> Cc: [e-mail]
> Cc: [e-mail]
> ---

Acked-by: Stephen Boyd <[e-mail]>

Unless you want me to pick this up?

Luis Chamberlain Feb. 23, 2023, 1:36 a.m. UTC | #2

On Wed, Feb 22, 2023 at 03:43:40PM -0800, Stephen Boyd wrote:
> Quoting Nick Alcock (2023-02-22 04:14:37)
> > 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: Florian Fainelli <[e-mail]>
> > Cc: Ray Jui <[e-mail]>
> > Cc: Scott Branden <[e-mail]>
> > Cc: [e-mail]
> > Cc: [e-mail]
> > Cc: [e-mail]
> > ---
> 
> Acked-by: Stephen Boyd <[e-mail]>
> 
> Unless you want me to pick this up?

Up to you, you can pick it up, and by rc3 of the next kernel I pick up
the last stragglers that no one picks up as reflected on linux-next.

  Luis

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

Quoting Nick Alcock (2023-02-22 04:14:37)
> 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: Florian Fainelli <[e-mail]>
> Cc: Ray Jui <[e-mail]>
> Cc: Scott Branden <[e-mail]>
> Cc: [e-mail]
> Cc: [e-mail]
> Cc: [e-mail]
> ---

Applied to clk-fixes

Patch

diff --git a/drivers/clk/bcm/clk-bcm2835-aux.c b/drivers/clk/bcm/clk-bcm2835-aux.c
index 290a2846a86b..0fafa5cba442 100644
--- a/drivers/clk/bcm/clk-bcm2835-aux.c
+++ b/drivers/clk/bcm/clk-bcm2835-aux.c
@@ -69,4 +69,3 @@  builtin_platform_driver(bcm2835_aux_clk_driver);
 
 MODULE_AUTHOR("Eric Anholt <[e-mail]>");
 MODULE_DESCRIPTION("BCM2835 auxiliary peripheral clock driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
index e74fe6219d14..8dc476ef5bf9 100644
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2350,4 +2350,3 @@  builtin_platform_driver(bcm2835_clk_driver);
 
 MODULE_AUTHOR("Eric Anholt <[e-mail]>");
 MODULE_DESCRIPTION("BCM2835 clock driver");
-MODULE_LICENSE("GPL");