2023-02-28 13:02:56

by Nick Alcock

Subject: [PATCH 00/20] MODULE_LICENSE removals, fifth tranche

This series, based on current modules-next, is part of a treewide cleanup
suggested by Luis Chamberlain, to remove the LICENSE_MODULE usage from
files/objects that are not tristate. Due to recent changes to kbuild, these
uses are now problematic. See the commit logs for more details.

(The commit log prefixes and Cc lists are automatically determined. I've
eyeballed them, and they seem reasonable: my apologies if they are not.)

I'll be sending a sixth and final tranche in a few days. (In total, there are 121
patches in this series.)


The series at a whole can be found here:
https://github.com/nickalcock/linux module-license

(This is a respin with kbuild: prefixes dropped. The previous series,
used in the mailouts of tranche 3 and earlier, is in the
module-license-kbuild-prefix branch.)

Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

Nick Alcock (20):
perf/hw_breakpoint: remove MODULE_LICENSE in non-modules
pinctrl: amd: remove MODULE_LICENSE in non-modules
pinctrl: mediatek: remove MODULE_LICENSE in non-modules
pinctrl: renesas: remove MODULE_LICENSE in non-modules
lib: remove MODULE_LICENSE in non-modules
powercap: remove MODULE_LICENSE in non-modules
power: supply: remove MODULE_LICENSE in non-modules
remoteproc: remove MODULE_LICENSE in non-modules
clk: renesas: remove MODULE_LICENSE in non-modules
reset: mchp: sparx5: remove MODULE_LICENSE in non-modules
reset: lantiq: remove MODULE_LICENSE in non-modules
clk: microchip: mpfs: remove MODULE_LICENSE in non-modules
reset: remove MODULE_LICENSE in non-modules
rv/reactor: remove MODULE_LICENSE in non-modules
tty: serial: imx: remove MODULE_LICENSE in non-modules
irqchip/irq-sl28cpld: remove MODULE_LICENSE in non-modules
ARC: reset: remove MODULE_LICENSE in non-modules
ARC: reset: remove MODULE_LICENSE in non-modules
power: reset: remove MODULE_LICENSE in non-modules
soc/tegra: cbb: remove MODULE_LICENSE in non-modules

drivers/clk/microchip/clk-mpfs.c | 1 -
drivers/clk/renesas/rcar-usb2-clock-sel.c | 1 -
drivers/clk/renesas/renesas-cpg-mssr.c | 1 -
drivers/clk/renesas/rzg2l-cpg.c | 1 -
drivers/irqchip/irq-sl28cpld.c | 1 -
drivers/pinctrl/mediatek/pinctrl-mt8188.c | 1 -
drivers/pinctrl/mediatek/pinctrl-mt8192.c | 1 -
drivers/pinctrl/mediatek/pinctrl-mt8365.c | 1 -
drivers/pinctrl/pinctrl-amd.c | 1 -
drivers/pinctrl/renesas/pinctrl-rza1.c | 1 -
drivers/pinctrl/renesas/pinctrl-rza2.c | 1 -
drivers/pinctrl/renesas/pinctrl-rzg2l.c | 1 -
drivers/pinctrl/renesas/pinctrl-rzn1.c | 1 -
drivers/pinctrl/renesas/pinctrl-rzv2m.c | 1 -
drivers/power/reset/as3722-poweroff.c | 1 -
drivers/power/reset/gpio-poweroff.c | 1 -
drivers/power/reset/gpio-restart.c | 1 -
drivers/power/reset/ltc2952-poweroff.c | 1 -
drivers/power/reset/regulator-poweroff.c | 1 -
drivers/power/reset/restart-poweroff.c | 1 -
drivers/power/reset/tps65086-restart.c | 1 -
drivers/power/supply/power_supply_core.c | 1 -
drivers/power/supply/wm97xx_battery.c | 1 -
drivers/powercap/powercap_sys.c | 1 -
drivers/remoteproc/remoteproc_core.c | 1 -
drivers/reset/reset-axs10x.c | 1 -
drivers/reset/reset-hsdk.c | 1 -
drivers/reset/reset-lantiq.c | 1 -
drivers/reset/reset-microchip-sparx5.c | 1 -
drivers/reset/reset-mpfs.c | 1 -
drivers/soc/tegra/cbb/tegra194-cbb.c | 1 -
drivers/soc/tegra/cbb/tegra234-cbb.c | 1 -
drivers/tty/serial/imx_earlycon.c | 1 -
kernel/events/hw_breakpoint_test.c | 1 -
kernel/trace/rv/reactor_panic.c | 1 -
kernel/trace/rv/reactor_printk.c | 1 -
lib/pldmfw/pldmfw.c | 1 -
37 files changed, 37 deletions(-)

--
2.39.1.268.g9de2f9a303

2023-02-28 13:03:00

by Nick Alcock

Subject: [PATCH 03/20] pinctrl: mediatek: 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: Sean Wang <[email protected]>
Cc: Linus Walleij <[email protected]>
Cc: Matthias Brugger <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
drivers/pinctrl/mediatek/pinctrl-mt8188.c | 1 -
drivers/pinctrl/mediatek/pinctrl-mt8192.c | 1 -
drivers/pinctrl/mediatek/pinctrl-mt8365.c | 1 -
3 files changed, 3 deletions(-)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8188.c b/drivers/pinctrl/mediatek/pinctrl-mt8188.c
index 6a3d0126288e2..c067e043e6192 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt8188.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8188.c
@@ -1670,5 +1670,4 @@ static int __init mt8188_pinctrl_init(void)

arch_initcall(mt8188_pinctrl_init);

-MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("MediaTek MT8188 Pinctrl Driver");
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8192.c b/drivers/pinctrl/mediatek/pinctrl-mt8192.c
index 9695f4ec6aba9..dee1b3aefd36e 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt8192.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8192.c
@@ -1431,5 +1431,4 @@ static int __init mt8192_pinctrl_init(void)
}
arch_initcall(mt8192_pinctrl_init);

-MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("MediaTek MT8192 Pinctrl Driver");
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8365.c b/drivers/pinctrl/mediatek/pinctrl-mt8365.c
index db4492e9ee673..75a505035e96b 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt8365.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8365.c
@@ -495,6 +495,5 @@ static int __init mtk_pinctrl_init(void)
}
arch_initcall(mtk_pinctrl_init);

-MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("MediaTek MT8365 Pinctrl Driver");
MODULE_AUTHOR("Zhiyong Tao <[email protected]>");
--
2.39.1.268.g9de2f9a303

2023-02-28 13:03:05

by Nick Alcock

Subject: [PATCH 01/20] perf/hw_breakpoint: 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: Peter Zijlstra <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: [email protected]
---
kernel/events/hw_breakpoint_test.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/kernel/events/hw_breakpoint_test.c b/kernel/events/hw_breakpoint_test.c
index c57610f52bb4d..2cfeeecf8de97 100644
--- a/kernel/events/hw_breakpoint_test.c
+++ b/kernel/events/hw_breakpoint_test.c
@@ -329,5 +329,4 @@ static struct kunit_suite hw_breakpoint_test_suite = {

kunit_test_suites(&hw_breakpoint_test_suite);

-MODULE_LICENSE("GPL");
MODULE_AUTHOR("Marco Elver <[email protected]>");
--
2.39.1.268.g9de2f9a303

2023-02-28 13:03:18

by Nick Alcock

Subject: [PATCH 04/20] pinctrl: renesas: 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: Geert Uytterhoeven <[email protected]>
Cc: Linus Walleij <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/pinctrl/renesas/pinctrl-rza1.c | 1 -
drivers/pinctrl/renesas/pinctrl-rza2.c | 1 -
drivers/pinctrl/renesas/pinctrl-rzg2l.c | 1 -
drivers/pinctrl/renesas/pinctrl-rzn1.c | 1 -
drivers/pinctrl/renesas/pinctrl-rzv2m.c | 1 -
5 files changed, 5 deletions(-)

diff --git a/drivers/pinctrl/renesas/pinctrl-rza1.c b/drivers/pinctrl/renesas/pinctrl-rza1.c
index 529c0fc4ec063..48173355a040a 100644
--- a/drivers/pinctrl/renesas/pinctrl-rza1.c
+++ b/drivers/pinctrl/renesas/pinctrl-rza1.c
@@ -1407,4 +1407,3 @@ core_initcall(rza1_pinctrl_init);

MODULE_AUTHOR("Jacopo Mondi <[email protected]");
MODULE_DESCRIPTION("Pin and gpio controller driver for Reneas RZ/A1 SoC");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/pinctrl/renesas/pinctrl-rza2.c b/drivers/pinctrl/renesas/pinctrl-rza2.c
index c0a04f1ee994e..40b1326a10776 100644
--- a/drivers/pinctrl/renesas/pinctrl-rza2.c
+++ b/drivers/pinctrl/renesas/pinctrl-rza2.c
@@ -514,4 +514,3 @@ core_initcall(rza2_pinctrl_init);

MODULE_AUTHOR("Chris Brandt <[email protected]>");
MODULE_DESCRIPTION("Pin and gpio controller driver for RZ/A2 SoC");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/pinctrl/renesas/pinctrl-rzg2l.c b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
index 5aa3836dbc226..362c3a0baf1df 100644
--- a/drivers/pinctrl/renesas/pinctrl-rzg2l.c
+++ b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
@@ -1561,4 +1561,3 @@ core_initcall(rzg2l_pinctrl_init);

MODULE_AUTHOR("Lad Prabhakar <[email protected]>");
MODULE_DESCRIPTION("Pin and gpio controller driver for RZ/G2L family");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/pinctrl/renesas/pinctrl-rzn1.c b/drivers/pinctrl/renesas/pinctrl-rzn1.c
index 9158c17574923..d73741651419f 100644
--- a/drivers/pinctrl/renesas/pinctrl-rzn1.c
+++ b/drivers/pinctrl/renesas/pinctrl-rzn1.c
@@ -952,4 +952,3 @@ subsys_initcall(_pinctrl_drv_register);

MODULE_AUTHOR("Phil Edworthy <[email protected]>");
MODULE_DESCRIPTION("Renesas RZ/N1 pinctrl driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/pinctrl/renesas/pinctrl-rzv2m.c b/drivers/pinctrl/renesas/pinctrl-rzv2m.c
index 3b65a71abd9ac..e5472293bc7fb 100644
--- a/drivers/pinctrl/renesas/pinctrl-rzv2m.c
+++ b/drivers/pinctrl/renesas/pinctrl-rzv2m.c
@@ -1117,4 +1117,3 @@ core_initcall(rzv2m_pinctrl_init);

MODULE_AUTHOR("Phil Edworthy <[email protected]>");
MODULE_DESCRIPTION("Pin and gpio controller driver for RZ/V2M");
-MODULE_LICENSE("GPL");
--
2.39.1.268.g9de2f9a303

2023-02-28 13:03:21

by Nick Alcock

Subject: [PATCH 05/20] lib: 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: Jacob Keller <[email protected]>
---
lib/pldmfw/pldmfw.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/lib/pldmfw/pldmfw.c b/lib/pldmfw/pldmfw.c
index 6e77eb6d8e72e..54e1809a38fd9 100644
--- a/lib/pldmfw/pldmfw.c
+++ b/lib/pldmfw/pldmfw.c
@@ -875,5 +875,4 @@ int pldmfw_flash_image(struct pldmfw *context, const struct firmware *fw)
EXPORT_SYMBOL(pldmfw_flash_image);

MODULE_AUTHOR("Jacob Keller <[email protected]>");
-MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("PLDM firmware flash update library");
--
2.39.1.268.g9de2f9a303

2023-02-28 13:03:42

by Nick Alcock

Subject: [PATCH 07/20] power: supply: 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: Sebastian Reichel <[email protected]>
Cc: [email protected]
---
drivers/power/supply/power_supply_core.c | 1 -
drivers/power/supply/wm97xx_battery.c | 1 -
2 files changed, 2 deletions(-)

diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index 7c790c41e2fe3..411fb8b8945a7 100644
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -1578,4 +1578,3 @@ MODULE_DESCRIPTION("Universal power supply monitor class");
MODULE_AUTHOR("Ian Molton <[email protected]>, "
"Szabolcs Gyurko, "
"Anton Vorontsov <[email protected]>");
-MODULE_LICENSE("GPL");
diff --git a/drivers/power/supply/wm97xx_battery.c b/drivers/power/supply/wm97xx_battery.c
index a0e1eaa25d93e..f4b190adb3359 100644
--- a/drivers/power/supply/wm97xx_battery.c
+++ b/drivers/power/supply/wm97xx_battery.c
@@ -271,6 +271,5 @@ static struct platform_driver wm97xx_bat_driver = {

module_platform_driver(wm97xx_bat_driver);

-MODULE_LICENSE("GPL");
MODULE_AUTHOR("Marek Vasut <[email protected]>");
MODULE_DESCRIPTION("WM97xx battery driver");
--
2.39.1.268.g9de2f9a303

2023-02-28 13:03:57

by Nick Alcock

Subject: [PATCH 06/20] powercap: 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: "Rafael J. Wysocki" <[email protected]>
Cc: [email protected]
---
drivers/powercap/powercap_sys.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
index 1f968353d4799..df806a788a02d 100644
--- a/drivers/powercap/powercap_sys.c
+++ b/drivers/powercap/powercap_sys.c
@@ -675,4 +675,3 @@ fs_initcall(powercap_init);

MODULE_DESCRIPTION("PowerCap sysfs Driver");
MODULE_AUTHOR("Srinivas Pandruvada <[email protected]>");
-MODULE_LICENSE("GPL v2");
--
2.39.1.268.g9de2f9a303

2023-02-28 13:04:30

by Nick Alcock

Subject: [PATCH 08/20] remoteproc: 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: Bjorn Andersson <[email protected]>
Cc: Mathieu Poirier <[email protected]>
Cc: [email protected]
---
drivers/remoteproc/remoteproc_core.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 1cd4815a6dd19..de1ace44cb57b 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -2765,5 +2765,4 @@ static void __exit remoteproc_exit(void)
}
module_exit(remoteproc_exit);

-MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("Generic Remote Processor Framework");
--
2.39.1.268.g9de2f9a303

2023-02-28 13:05:55

by Nick Alcock

Subject: [PATCH 10/20] reset: mchp: sparx5: 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: Philipp Zabel <[email protected]>
Cc: Lars Povlsen <[email protected]>
Cc: Steen Hegelund <[email protected]>
Cc: Daniel Machon <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/reset/reset-microchip-sparx5.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/reset/reset-microchip-sparx5.c b/drivers/reset/reset-microchip-sparx5.c
index f3528dd1d084e..ead25942061d2 100644
--- a/drivers/reset/reset-microchip-sparx5.c
+++ b/drivers/reset/reset-microchip-sparx5.c
@@ -179,4 +179,3 @@ postcore_initcall(mchp_sparx5_reset_init);

MODULE_DESCRIPTION("Microchip Sparx5 switch reset driver");
MODULE_AUTHOR("Steen Hegelund <[email protected]>");
-MODULE_LICENSE("Dual MIT/GPL");
--
2.39.1.268.g9de2f9a303

2023-02-28 13:06:12

by Nick Alcock

Subject: [PATCH 16/20] irqchip/irq-sl28cpld: 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 Walle <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Marc Zyngier <[email protected]>
---
drivers/irqchip/irq-sl28cpld.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/irqchip/irq-sl28cpld.c b/drivers/irqchip/irq-sl28cpld.c
index f2172240172c4..e50f9eaba4cd9 100644
--- a/drivers/irqchip/irq-sl28cpld.c
+++ b/drivers/irqchip/irq-sl28cpld.c
@@ -92,4 +92,3 @@ module_platform_driver(sl28cpld_intc_driver);

MODULE_DESCRIPTION("sl28cpld Interrupt Controller Driver");
MODULE_AUTHOR("Michael Walle <[email protected]>");
-MODULE_LICENSE("GPL");
--
2.39.1.268.g9de2f9a303

2023-02-28 13:06:16

by Nick Alcock

Subject: [PATCH 13/20] reset: 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: Conor Dooley <[email protected]>
Cc: Daire McNamara <[email protected]>
Cc: Philipp Zabel <[email protected]>
Cc: [email protected]
---
drivers/reset/reset-mpfs.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/reset/reset-mpfs.c b/drivers/reset/reset-mpfs.c
index e003e50590ec5..e71ab73092abd 100644
--- a/drivers/reset/reset-mpfs.c
+++ b/drivers/reset/reset-mpfs.c
@@ -153,5 +153,4 @@ module_auxiliary_driver(mpfs_reset_driver);

MODULE_DESCRIPTION("Microchip PolarFire SoC Reset Driver");
MODULE_AUTHOR("Conor Dooley <[email protected]>");
-MODULE_LICENSE("GPL");
MODULE_IMPORT_NS(MCHP_CLK_MPFS);
--
2.39.1.268.g9de2f9a303

2023-02-28 13:06:20

by Nick Alcock

Subject: [PATCH 12/20] clk: microchip: mpfs: 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: Conor Dooley <[email protected]>
Cc: Daire McNamara <[email protected]>
Cc: Michael Turquette <[email protected]>
Cc: Stephen Boyd <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/clk/microchip/clk-mpfs.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/clk/microchip/clk-mpfs.c b/drivers/clk/microchip/clk-mpfs.c
index 4f0a19db7ed74..d85b345f4c08d 100644
--- a/drivers/clk/microchip/clk-mpfs.c
+++ b/drivers/clk/microchip/clk-mpfs.c
@@ -513,4 +513,3 @@ MODULE_DESCRIPTION("Microchip PolarFire SoC Clock Driver");
MODULE_AUTHOR("Padmarao Begari <[email protected]>");
MODULE_AUTHOR("Daire McNamara <[email protected]>");
MODULE_AUTHOR("Conor Dooley <[email protected]>");
-MODULE_LICENSE("GPL");
--
2.39.1.268.g9de2f9a303

2023-02-28 13:06:44

by Nick Alcock

Subject: [PATCH 19/20] power: reset: 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: Sebastian Reichel <[email protected]>
Cc: [email protected]
---
drivers/power/reset/as3722-poweroff.c | 1 -
drivers/power/reset/gpio-poweroff.c | 1 -
drivers/power/reset/gpio-restart.c | 1 -
drivers/power/reset/ltc2952-poweroff.c | 1 -
drivers/power/reset/regulator-poweroff.c | 1 -
drivers/power/reset/restart-poweroff.c | 1 -
drivers/power/reset/tps65086-restart.c | 1 -
7 files changed, 7 deletions(-)

diff --git a/drivers/power/reset/as3722-poweroff.c b/drivers/power/reset/as3722-poweroff.c
index 661e1c67f82ee..80edff1a556f8 100644
--- a/drivers/power/reset/as3722-poweroff.c
+++ b/drivers/power/reset/as3722-poweroff.c
@@ -84,4 +84,3 @@ module_platform_driver(as3722_poweroff_driver);
MODULE_DESCRIPTION("Power off driver for ams AS3722 PMIC Device");
MODULE_ALIAS("platform:as3722-power-off");
MODULE_AUTHOR("Laxman Dewangan <[email protected]>");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
index 1c5af2fef1423..84b3c3528afa1 100644
--- a/drivers/power/reset/gpio-poweroff.c
+++ b/drivers/power/reset/gpio-poweroff.c
@@ -105,5 +105,4 @@ module_platform_driver(gpio_poweroff_driver);

MODULE_AUTHOR("Jamie Lentin <[email protected]>");
MODULE_DESCRIPTION("GPIO poweroff driver");
-MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:poweroff-gpio");
diff --git a/drivers/power/reset/gpio-restart.c b/drivers/power/reset/gpio-restart.c
index 5466eeea261cd..35d981d5e6c8f 100644
--- a/drivers/power/reset/gpio-restart.c
+++ b/drivers/power/reset/gpio-restart.c
@@ -139,4 +139,3 @@ module_platform_driver(gpio_restart_driver);

MODULE_AUTHOR("David Riley <[email protected]>");
MODULE_DESCRIPTION("GPIO restart driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/power/reset/ltc2952-poweroff.c b/drivers/power/reset/ltc2952-poweroff.c
index 65d9528cc9899..eea05921a054b 100644
--- a/drivers/power/reset/ltc2952-poweroff.c
+++ b/drivers/power/reset/ltc2952-poweroff.c
@@ -317,4 +317,3 @@ module_platform_driver(ltc2952_poweroff_driver);

MODULE_AUTHOR("René Moll <[email protected]>");
MODULE_DESCRIPTION("LTC PowerPath power-off driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/power/reset/regulator-poweroff.c b/drivers/power/reset/regulator-poweroff.c
index 20701203935f0..7f87fbb8b051e 100644
--- a/drivers/power/reset/regulator-poweroff.c
+++ b/drivers/power/reset/regulator-poweroff.c
@@ -79,5 +79,4 @@ module_platform_driver(regulator_poweroff_driver);

MODULE_AUTHOR("Michael Klein <[email protected]>");
MODULE_DESCRIPTION("Regulator poweroff driver");
-MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:poweroff-regulator");
diff --git a/drivers/power/reset/restart-poweroff.c b/drivers/power/reset/restart-poweroff.c
index 04d4228119b2c..28f1822db1626 100644
--- a/drivers/power/reset/restart-poweroff.c
+++ b/drivers/power/reset/restart-poweroff.c
@@ -59,5 +59,4 @@ module_platform_driver(restart_poweroff_driver);

MODULE_AUTHOR("Andrew Lunn <[email protected]");
MODULE_DESCRIPTION("restart poweroff driver");
-MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:poweroff-restart");
diff --git a/drivers/power/reset/tps65086-restart.c b/drivers/power/reset/tps65086-restart.c
index 78b89f745a3de..5ec819eac7da4 100644
--- a/drivers/power/reset/tps65086-restart.c
+++ b/drivers/power/reset/tps65086-restart.c
@@ -95,4 +95,3 @@ module_platform_driver(tps65086_restart_driver);

MODULE_AUTHOR("Emil Renner Berthing <[email protected]>");
MODULE_DESCRIPTION("TPS65086 restart driver");
-MODULE_LICENSE("GPL v2");
--
2.39.1.268.g9de2f9a303

2023-02-28 13:35:50

by Mukesh Ojha

Subject: Re: [PATCH 08/20] remoteproc: remove MODULE_LICENSE in non-modules

On 2/28/2023 6:32 PM, 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 <[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: Bjorn Andersson <[email protected]>
> Cc: Mathieu Poirier <[email protected]>
> Cc: [email protected]

Acked-by: Mukesh Ojha <[email protected]>

-Mukesh
> ---
> drivers/remoteproc/remoteproc_core.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
> index 1cd4815a6dd19..de1ace44cb57b 100644
> --- a/drivers/remoteproc/remoteproc_core.c
> +++ b/drivers/remoteproc/remoteproc_core.c
> @@ -2765,5 +2765,4 @@ static void __exit remoteproc_exit(void)
> }
> module_exit(remoteproc_exit);
>
> -MODULE_LICENSE("GPL v2");
> MODULE_DESCRIPTION("Generic Remote Processor Framework");

2023-02-28 13:48:34

by Geert Uytterhoeven

Subject: Re: [PATCH 00/20] MODULE_LICENSE removals, fifth tranche

Hi Nick,

On Tue, Feb 28, 2023 at 2:05 PM Nick Alcock <[email protected]> wrote:
> This series, based on current modules-next, is part of a treewide cleanup
> suggested by Luis Chamberlain, to remove the LICENSE_MODULE usage from
> files/objects that are not tristate. Due to recent changes to kbuild, these
> uses are now problematic. See the commit logs for more details.

Does this mean you expect us to queue them for v6.3?
Thanks!

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

2023-02-28 13:50:54

by Nick Alcock

Subject: [PATCH 09/20] clk: renesas: 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: Geert Uytterhoeven <[email protected]>
Cc: Michael Turquette <[email protected]>
Cc: Stephen Boyd <[email protected]>
Cc: Philipp Zabel <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/clk/renesas/rcar-usb2-clock-sel.c | 1 -
drivers/clk/renesas/renesas-cpg-mssr.c | 1 -
drivers/clk/renesas/rzg2l-cpg.c | 1 -
3 files changed, 3 deletions(-)

diff --git a/drivers/clk/renesas/rcar-usb2-clock-sel.c b/drivers/clk/renesas/rcar-usb2-clock-sel.c
index 684d8937965e0..ba6b5bd67786f 100644
--- a/drivers/clk/renesas/rcar-usb2-clock-sel.c
+++ b/drivers/clk/renesas/rcar-usb2-clock-sel.c
@@ -220,4 +220,3 @@ static struct platform_driver rcar_usb2_clock_sel_driver = {
builtin_platform_driver(rcar_usb2_clock_sel_driver);

MODULE_DESCRIPTION("Renesas R-Car USB2 clock selector Driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c
index 1a0cdf001b2f2..bfe5dc9a2e36b 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.c
+++ b/drivers/clk/renesas/renesas-cpg-mssr.c
@@ -1154,4 +1154,3 @@ void __init mssr_mod_reparent(struct mssr_mod_clk *mod_clks,
}

MODULE_DESCRIPTION("Renesas CPG/MSSR Driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/clk/renesas/rzg2l-cpg.c b/drivers/clk/renesas/rzg2l-cpg.c
index 4bf40f6ccd1d1..93b02cdc98c25 100644
--- a/drivers/clk/renesas/rzg2l-cpg.c
+++ b/drivers/clk/renesas/rzg2l-cpg.c
@@ -1440,4 +1440,3 @@ static int __init rzg2l_cpg_init(void)
subsys_initcall(rzg2l_cpg_init);

MODULE_DESCRIPTION("Renesas RZ/G2L CPG Driver");
-MODULE_LICENSE("GPL v2");
--
2.39.1.268.g9de2f9a303

2023-02-28 14:05:18

by Nick Alcock

Subject: [PATCH 14/20] rv/reactor: 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: Daniel Bristot de Oliveira <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Masami Hiramatsu <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
kernel/trace/rv/reactor_panic.c | 1 -
kernel/trace/rv/reactor_printk.c | 1 -
2 files changed, 2 deletions(-)

diff --git a/kernel/trace/rv/reactor_panic.c b/kernel/trace/rv/reactor_panic.c
index d65f6c25a87cd..0186ff4cbd0b4 100644
--- a/kernel/trace/rv/reactor_panic.c
+++ b/kernel/trace/rv/reactor_panic.c
@@ -38,6 +38,5 @@ static void __exit unregister_react_panic(void)
module_init(register_react_panic);
module_exit(unregister_react_panic);

-MODULE_LICENSE("GPL");
MODULE_AUTHOR("Daniel Bristot de Oliveira");
MODULE_DESCRIPTION("panic rv reactor: panic if an exception is found.");
diff --git a/kernel/trace/rv/reactor_printk.c b/kernel/trace/rv/reactor_printk.c
index 4b6b7106a477c..178759dbf89f5 100644
--- a/kernel/trace/rv/reactor_printk.c
+++ b/kernel/trace/rv/reactor_printk.c
@@ -37,6 +37,5 @@ static void __exit unregister_react_printk(void)
module_init(register_react_printk);
module_exit(unregister_react_printk);

-MODULE_LICENSE("GPL");
MODULE_AUTHOR("Daniel Bristot de Oliveira");
MODULE_DESCRIPTION("printk rv reactor: printk if an exception is hit.");
--
2.39.1.268.g9de2f9a303

2023-02-28 14:16:51

by Nick Alcock

Subject: [PATCH 11/20] reset: lantiq: 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: Philipp Zabel <[email protected]>
---
drivers/reset/reset-lantiq.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/reset/reset-lantiq.c b/drivers/reset/reset-lantiq.c
index b936cfe856413..549ba45d85971 100644
--- a/drivers/reset/reset-lantiq.c
+++ b/drivers/reset/reset-lantiq.c
@@ -207,4 +207,3 @@ module_platform_driver(lantiq_rcu_reset_driver);

MODULE_AUTHOR("Martin Blumenstingl <[email protected]>");
MODULE_DESCRIPTION("Lantiq XWAY RCU Reset Controller Driver");
-MODULE_LICENSE("GPL");
--
2.39.1.268.g9de2f9a303

2023-02-28 14:47:02

by Nick Alcock

Subject: [PATCH 17/20] ARC: reset: 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: Eugeniy Paltsev <[email protected]>
Cc: Philipp Zabel <[email protected]>
---
drivers/reset/reset-axs10x.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/reset/reset-axs10x.c b/drivers/reset/reset-axs10x.c
index a854ef41364d6..4cb25b0af8d82 100644
--- a/drivers/reset/reset-axs10x.c
+++ b/drivers/reset/reset-axs10x.c
@@ -81,4 +81,3 @@ builtin_platform_driver(axs10x_reset_driver);

MODULE_AUTHOR("Eugeniy Paltsev <[email protected]>");
MODULE_DESCRIPTION("Synopsys AXS10x reset driver");
-MODULE_LICENSE("GPL v2");
--
2.39.1.268.g9de2f9a303

2023-02-28 14:53:31

by Steen Hegelund

Subject: Re: [PATCH 10/20] reset: mchp: sparx5: remove MODULE_LICENSE in non-modules

Hi Nick,

Looks good to me.

Reviewed-by: Steen Hegelund <[email protected]>

On Tue, 2023-02-28 at 13:02 +0000, Nick Alcock wrote:
> [Some people who received this message don't often get email from
> [email protected]. Learn why this is important at
> https://aka.ms/LearnAboutSenderIdentification ]
>
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the
> content is safe
>
> 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: Philipp Zabel <[email protected]>
> Cc: Lars Povlsen <[email protected]>
> Cc: Steen Hegelund <[email protected]>
> Cc: Daniel Machon <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> ---
>  drivers/reset/reset-microchip-sparx5.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/drivers/reset/reset-microchip-sparx5.c b/drivers/reset/reset-
> microchip-sparx5.c
> index f3528dd1d084e..ead25942061d2 100644
> --- a/drivers/reset/reset-microchip-sparx5.c
> +++ b/drivers/reset/reset-microchip-sparx5.c
> @@ -179,4 +179,3 @@ postcore_initcall(mchp_sparx5_reset_init);
>
>  MODULE_DESCRIPTION("Microchip Sparx5 switch reset driver");
>  MODULE_AUTHOR("Steen Hegelund <[email protected]>");
> -MODULE_LICENSE("Dual MIT/GPL");
> --
> 2.39.1.268.g9de2f9a303
>

BR
Steen

2023-02-28 14:55:23

by Nick Alcock

Subject: [PATCH 18/20] ARC: reset: 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: Eugeniy Paltsev <[email protected]>
Cc: Philipp Zabel <[email protected]>
---
drivers/reset/reset-hsdk.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/reset/reset-hsdk.c b/drivers/reset/reset-hsdk.c
index 4c7b8647b49ca..92a37f30bd817 100644
--- a/drivers/reset/reset-hsdk.c
+++ b/drivers/reset/reset-hsdk.c
@@ -135,4 +135,3 @@ builtin_platform_driver(hsdk_reset_driver);

MODULE_AUTHOR("Eugeniy Paltsev <[email protected]>");
MODULE_DESCRIPTION("Synopsys HSDK SDP reset driver");
-MODULE_LICENSE("GPL v2");
--
2.39.1.268.g9de2f9a303

2023-02-28 15:38:15

by Nick Alcock

Subject: [PATCH 20/20] soc/tegra: cbb: 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: Thierry Reding <[email protected]>
Cc: Jonathan Hunter <[email protected]>
Cc: [email protected]
---
drivers/soc/tegra/cbb/tegra194-cbb.c | 1 -
drivers/soc/tegra/cbb/tegra234-cbb.c | 1 -
2 files changed, 2 deletions(-)

diff --git a/drivers/soc/tegra/cbb/tegra194-cbb.c b/drivers/soc/tegra/cbb/tegra194-cbb.c
index d4112b683f00f..a2347e5b7c00a 100644
--- a/drivers/soc/tegra/cbb/tegra194-cbb.c
+++ b/drivers/soc/tegra/cbb/tegra194-cbb.c
@@ -2359,4 +2359,3 @@ module_exit(tegra194_cbb_exit);

MODULE_AUTHOR("Sumit Gupta <[email protected]>");
MODULE_DESCRIPTION("Control Backbone error handling driver for Tegra194");
-MODULE_LICENSE("GPL");
diff --git a/drivers/soc/tegra/cbb/tegra234-cbb.c b/drivers/soc/tegra/cbb/tegra234-cbb.c
index f33d094e5ea60..7268bb7ef448f 100644
--- a/drivers/soc/tegra/cbb/tegra234-cbb.c
+++ b/drivers/soc/tegra/cbb/tegra234-cbb.c
@@ -1218,4 +1218,3 @@ static void __exit tegra234_cbb_exit(void)
module_exit(tegra234_cbb_exit);

MODULE_DESCRIPTION("Control Backbone 2.0 error handling driver for Tegra234");
-MODULE_LICENSE("GPL");
--
2.39.1.268.g9de2f9a303

2023-02-28 16:12:14

by Michael Walle

Subject: Re: [PATCH 16/20] irqchip/irq-sl28cpld: remove MODULE_LICENSE in non-modules

Am 2023-02-28 14:02, schrieb Nick Alcock:
> 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]>

Acked-by: Michael Walle <[email protected]>

2023-02-28 16:22:48

by Nick Alcock

Subject: [PATCH 15/20] tty: serial: imx: 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: Greg Kroah-Hartman <[email protected]>
Cc: Jiri Slaby <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/tty/serial/imx_earlycon.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/tty/serial/imx_earlycon.c b/drivers/tty/serial/imx_earlycon.c
index 7aab38b2bd8cb..2dacd7ae63088 100644
--- a/drivers/tty/serial/imx_earlycon.c
+++ b/drivers/tty/serial/imx_earlycon.c
@@ -47,4 +47,3 @@ OF_EARLYCON_DECLARE(ec_imx21, "fsl,imx21-uart", imx_console_early_setup);

MODULE_AUTHOR("NXP");
MODULE_DESCRIPTION("IMX earlycon driver");
-MODULE_LICENSE("GPL");
--
2.39.1.268.g9de2f9a303

2023-02-28 16:35:53

by Jacob Keller

Subject: RE: [PATCH 05/20] lib: remove MODULE_LICENSE in non-modules

> -----Original Message-----
> From: Nick Alcock <[email protected]>
> Sent: Tuesday, February 28, 2023 5:02 AM
> To: [email protected]
> Cc: [email protected]; [email protected]; Hitomi
> Hasegawa <[email protected]>; Keller, Jacob E
> <[email protected]>
> Subject: [PATCH 05/20] lib: 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: Jacob Keller <[email protected]>

Acked-by: Jacob Keller <[email protected]>

> ---
> lib/pldmfw/pldmfw.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/lib/pldmfw/pldmfw.c b/lib/pldmfw/pldmfw.c
> index 6e77eb6d8e72e..54e1809a38fd9 100644
> --- a/lib/pldmfw/pldmfw.c
> +++ b/lib/pldmfw/pldmfw.c
> @@ -875,5 +875,4 @@ int pldmfw_flash_image(struct pldmfw *context, const
> struct firmware *fw)
> EXPORT_SYMBOL(pldmfw_flash_image);
>
> MODULE_AUTHOR("Jacob Keller <[email protected]>");
> -MODULE_LICENSE("GPL v2");
> MODULE_DESCRIPTION("PLDM firmware flash update library");
> --
> 2.39.1.268.g9de2f9a303

2023-02-28 19:17:50

by Conor Dooley

Subject: Re: [PATCH 13/20] reset: remove MODULE_LICENSE in non-modules

On Tue, Feb 28, 2023 at 01:02:08PM +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 <[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: Conor Dooley <[email protected]>
> Cc: Daire McNamara <[email protected]>
> Cc: Philipp Zabel <[email protected]>
> Cc: [email protected]
> ---
> drivers/reset/reset-mpfs.c | 1 -

I assume your script just got confused here w/ $subject, since there's
only a change for this specific file.
Reviewed-by: Conor Dooley <[email protected]>

Thanks,
Conor.

Attachments:

2023-02-28 19:19:42

by Conor Dooley

Subject: Re: [PATCH 12/20] clk: microchip: mpfs: remove MODULE_LICENSE in non-modules

On Tue, Feb 28, 2023 at 01:02:07PM +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 <[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: Conor Dooley <[email protected]>
> Cc: Daire McNamara <[email protected]>
> Cc: Michael Turquette <[email protected]>
> Cc: Stephen Boyd <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> ---
> drivers/clk/microchip/clk-mpfs.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/clk/microchip/clk-mpfs.c b/drivers/clk/microchip/clk-mpfs.c
> index 4f0a19db7ed74..d85b345f4c08d 100644
> --- a/drivers/clk/microchip/clk-mpfs.c
> +++ b/drivers/clk/microchip/clk-mpfs.c
> @@ -513,4 +513,3 @@ MODULE_DESCRIPTION("Microchip PolarFire SoC Clock Driver");
> MODULE_AUTHOR("Padmarao Begari <[email protected]>");
> MODULE_AUTHOR("Daire McNamara <[email protected]>");
> MODULE_AUTHOR("Conor Dooley <[email protected]>");
> -MODULE_LICENSE("GPL");

Reviewed-by: Conor Dooley <[email protected]>

I'll take this via the microchip/at91 clock tree after v6.3-rc1 has been
released.

Thanks,
Conor.

Attachments:

2023-02-28 19:27:18

by Nick Alcock

Subject: Re: [PATCH 13/20] reset: remove MODULE_LICENSE in non-modules

[dropped non-lists to defend innocent ears from my flaming pedantry]

On 28 Feb 2023, Conor Dooley stated:

> On Tue, Feb 28, 2023 at 01:02:08PM +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 <[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: Conor Dooley <[email protected]>
>> Cc: Daire McNamara <[email protected]>
>> Cc: Philipp Zabel <[email protected]>
>> Cc: [email protected]
>> ---
>> drivers/reset/reset-mpfs.c | 1 -
>
> I assume your script just got confused here w/ $subject, since there's
> only a change for this specific file.

This file has had no commits since you wrote it last year, and the
subject for that commit was

reset: add polarfire soc reset support

so, er, yes, the script used 'reset:' as a prefix, mimicking the
existing commit. I'm not sure what else it could have done.

(Regarding the rest of the subject line, I suppose I could have arranged
to detect single-file commits and turned the subject into 'in this
non-module'? But there comes a time when even I think that maybe I might
be overdesigning something, and automated grammatical adjustments to the
subject line was that point!)

--
NULL && (void)

2023-02-28 19:53:21

by Conor Dooley

Subject: Re: [PATCH 13/20] reset: remove MODULE_LICENSE in non-modules

On Tue, Feb 28, 2023 at 07:26:55PM +0000, Nick Alcock wrote:
> [dropped non-lists to defend innocent ears from my flaming pedantry]
>
> On 28 Feb 2023, Conor Dooley stated:
>
> > On Tue, Feb 28, 2023 at 01:02:08PM +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 <[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: Conor Dooley <[email protected]>
> >> Cc: Daire McNamara <[email protected]>
> >> Cc: Philipp Zabel <[email protected]>
> >> Cc: [email protected]
> >> ---
> >> drivers/reset/reset-mpfs.c | 1 -
> >
> > I assume your script just got confused here w/ $subject, since there's
> > only a change for this specific file.
>
> This file has had no commits since you wrote it last year, and the
> subject for that commit was
>
> reset: add polarfire soc reset support
>
> so, er, yes, the script used 'reset:' as a prefix, mimicking the
> existing commit. I'm not sure what else it could have done.

Oh ye, silly me - I didn't think of that. I guess that's a common
pattern for commits adding a driver, as the "mpfs:" doesn't really make
sense until the driver is in-tree.
I'm not too sure what you could have done either, but I'm not
complaining, or requesting that something be changed here.

> (Regarding the rest of the subject line, I suppose I could have arranged
> to detect single-file commits and turned the subject into 'in this
> non-module'? But there comes a time when even I think that maybe I might
> be overdesigning something, and automated grammatical adjustments to the
> subject line was that point!)

Yeah, I think it's not worth doing anything about really...

Attachments:

2023-02-28 20:34:05

by Rafael J. Wysocki

Subject: Re: [PATCH 06/20] powercap: remove MODULE_LICENSE in non-modules

On Tue, Feb 28, 2023 at 2:03 PM Nick Alcock <[email protected]> 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 <[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: "Rafael J. Wysocki" <[email protected]>
> Cc: [email protected]
> ---
> drivers/powercap/powercap_sys.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
> index 1f968353d4799..df806a788a02d 100644
> --- a/drivers/powercap/powercap_sys.c
> +++ b/drivers/powercap/powercap_sys.c
> @@ -675,4 +675,3 @@ fs_initcall(powercap_init);
>
> MODULE_DESCRIPTION("PowerCap sysfs Driver");
> MODULE_AUTHOR("Srinivas Pandruvada <[email protected]>");
> -MODULE_LICENSE("GPL v2");
> --

Applied as 6.3-rc material, thanks!

2023-03-02 22:02:17

by Mathieu Poirier

Subject: Re: [PATCH 08/20] remoteproc: remove MODULE_LICENSE in non-modules

On Tue, 28 Feb 2023 at 06:03, Nick Alcock <[email protected]> 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 <[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: Bjorn Andersson <[email protected]>
> Cc: Mathieu Poirier <[email protected]>
> Cc: [email protected]
> ---
> drivers/remoteproc/remoteproc_core.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
> index 1cd4815a6dd19..de1ace44cb57b 100644
> --- a/drivers/remoteproc/remoteproc_core.c
> +++ b/drivers/remoteproc/remoteproc_core.c
> @@ -2765,5 +2765,4 @@ static void __exit remoteproc_exit(void)
> }
> module_exit(remoteproc_exit);
>
> -MODULE_LICENSE("GPL v2");

Reviewed-by: Mathieu Poirier <[email protected]>

> MODULE_DESCRIPTION("Generic Remote Processor Framework");
> --
> 2.39.1.268.g9de2f9a303
>

2023-03-09 16:39:29

by Greg KH

Subject: Re: [PATCH 00/20] MODULE_LICENSE removals, fifth tranche

On Tue, Feb 28, 2023 at 01:01:55PM +0000, Nick Alcock wrote:
> This series, based on current modules-next, is part of a treewide cleanup
> suggested by Luis Chamberlain, to remove the LICENSE_MODULE usage from
> files/objects that are not tristate. Due to recent changes to kbuild, these
> uses are now problematic. See the commit logs for more details.

Why isn't kbuild fixed instead? These files can have MODULE_AUTHOR()
and other macros when built into the kernel, what is so special about
MODULE_LICENSE() that prevents this from working properly?

There should not be a need to remove these markings in my opinion, why
treat one MODULE_* macro more special than others?

thanks,

greg k-h

2023-03-20 11:11:28

by Nick Alcock

Subject: Re: [PATCH 00/20] MODULE_LICENSE removals, fifth tranche

On 28 Feb 2023, Geert Uytterhoeven outgrape:

> On Tue, Feb 28, 2023 at 2:05 PM Nick Alcock <[email protected]> wrote:
>> This series, based on current modules-next, is part of a treewide cleanup
>> suggested by Luis Chamberlain, to remove the LICENSE_MODULE usage from
>> files/objects that are not tristate. Due to recent changes to kbuild, these
>> uses are now problematic. See the commit logs for more details.
>
> Does this mean you expect us to queue them for v6.3?
> Thanks!

I believe Luis is planning to pull them in around -rc3, hence my
freshening the series up now, getting everyone's tags in, etc.

--
NULL && (void)

2023-04-05 13:26:30

by Thierry Reding

Subject: Re: (subset) [PATCH 20/20] soc/tegra: cbb: remove MODULE_LICENSE in non-modules

From: Thierry Reding <[email protected]>

On Tue, 28 Feb 2023 13:02:15 +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.
>
> [...]

Applied, thanks!

[20/20] soc/tegra: cbb: remove MODULE_LICENSE in non-modules
(no commit info)

Best regards,
--
Thierry Reding <[email protected]>