LinuxLists.cc - [PATCH 11/27] kbuild, clk: bcm2835: remove MODULE

2023-02-22 12:17:56

Subject: [PATCH 11/27] kbuild, clk: bcm2835: remove MODULE_LICENSE in non-modules

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 <[email protected]>
Suggested-by: Luis Chamberlain <[email protected]>
Cc: Luis Chamberlain <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Hitomi Hasegawa <[email protected]>
Cc: Michael Turquette <[email protected]>
Cc: Stephen Boyd <[email protected]>
Cc: Florian Fainelli <[email protected]>
Cc: Ray Jui <[email protected]>
Cc: Scott Branden <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
drivers/clk/bcm/clk-bcm2835-aux.c | 1 -
drivers/clk/bcm/clk-bcm2835.c | 1 -
2 files changed, 2 deletions(-)

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 <[email protected]>");
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 <[email protected]>");
MODULE_DESCRIPTION("BCM2835 clock driver");
-MODULE_LICENSE("GPL");
--
2.39.1.268.g9de2f9a303

2023-02-22 23:43:47

by Stephen Boyd

[permalink] [raw]

Subject: Re: [PATCH 11/27] kbuild, clk: bcm2835: remove MODULE_LICENSE in non-modules

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 <[email protected]>
> Suggested-by: Luis Chamberlain <[email protected]>
> Cc: Luis Chamberlain <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: Hitomi Hasegawa <[email protected]>
> Cc: Michael Turquette <[email protected]>
> Cc: Stephen Boyd <[email protected]>
> Cc: Florian Fainelli <[email protected]>
> Cc: Ray Jui <[email protected]>
> Cc: Scott Branden <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---

Acked-by: Stephen Boyd <[email protected]>

Unless you want me to pick this up?

2023-02-23 01:37:04

by Luis Chamberlain

[permalink] [raw]

Subject: Re: [PATCH 11/27] kbuild, clk: bcm2835: remove MODULE_LICENSE in non-modules

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 <[email protected]>
> > Suggested-by: Luis Chamberlain <[email protected]>
> > Cc: Luis Chamberlain <[email protected]>
> > Cc: [email protected]
> > Cc: [email protected]
> > Cc: Hitomi Hasegawa <[email protected]>
> > Cc: Michael Turquette <[email protected]>
> > Cc: Stephen Boyd <[email protected]>
> > Cc: Florian Fainelli <[email protected]>
> > Cc: Ray Jui <[email protected]>
> > Cc: Scott Branden <[email protected]>
> > Cc: [email protected]
> > Cc: [email protected]
> > Cc: [email protected]
> > ---
>
> Acked-by: Stephen Boyd <[email protected]>
>
> 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

2023-03-06 19:30:16

by Stephen Boyd

[permalink] [raw]