Re: [PATCH 26/27] mfd: remove MODULE_LICENSE in non-modules

Lee Jones
2023-03-03T10:52:19Z

On Fri, 24 Feb 2023, 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 <nick.alcock@oracle.com>
> Suggested-by: Luis Chamberlain <mcgrof@kernel.org>
> Cc: Luis Chamberlain <mcgrof@kernel.org>
> Cc: linux-modules@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Cc: Hitomi Hasegawa <hasegawa-hitomi@fujitsu.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Lee Jones <lee@kernel.org>
> Cc: linux-omap@vger.kernel.org
> ---
> drivers/mfd/omap-usb-host.c | 1 -
> drivers/mfd/omap-usb-tll.c | 1 -
> drivers/mfd/twl4030-audio.c | 1 -
> drivers/mfd/twl6040.c | 1 -
> 4 files changed, 4 deletions(-)

Please adapt the subject line(s) to include the drivers changed. It might
also make sense to separate out changes to cover one driver per patch.

mfd: <device>: Succinct subject-line describing changes

> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
> index 787d2ae86375..7f5775109593 100644
> --- a/drivers/mfd/omap-usb-host.c
> +++ b/drivers/mfd/omap-usb-host.c
> @@ -853,7 +853,6 @@ static struct platform_driver usbhs_omap_driver = {
> MODULE_AUTHOR("Keshava Munegowda <keshava_mgowda@ti.com>");
> MODULE_AUTHOR("Roger Quadros <rogerq@ti.com>");
> MODULE_ALIAS("platform:" USBHS_DRIVER_NAME);
> -MODULE_LICENSE("GPL v2");
> MODULE_DESCRIPTION("usb host common core driver for omap EHCI and OHCI");
>
> static int omap_usbhs_drvinit(void)
> diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c
> index 080d7970a377..8ca4067da6cd 100644
> --- a/drivers/mfd/omap-usb-tll.c
> +++ b/drivers/mfd/omap-usb-tll.c
> @@ -450,7 +450,6 @@ EXPORT_SYMBOL_GPL(omap_tll_disable);
>
> MODULE_AUTHOR("Keshava Munegowda <keshava_mgowda@ti.com>");
> MODULE_AUTHOR("Roger Quadros <rogerq@ti.com>");
> -MODULE_LICENSE("GPL v2");
> MODULE_DESCRIPTION("usb tll driver for TI OMAP EHCI and OHCI controllers");
>
> static int __init omap_usbtll_drvinit(void)
> diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c
> index 4536d829b43e..88002f8941e5 100644
> --- a/drivers/mfd/twl4030-audio.c
> +++ b/drivers/mfd/twl4030-audio.c
> @@ -285,5 +285,4 @@ module_platform_driver(twl4030_audio_driver);
>
> MODULE_AUTHOR("Peter Ujfalusi <peter.ujfalusi@ti.com>");
> MODULE_DESCRIPTION("TWL4030 audio block MFD driver");
> -MODULE_LICENSE("GPL");
> MODULE_ALIAS("platform:twl4030-audio");
> diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c
> index fc97fa5a2d0c..e982119bbefa 100644
> --- a/drivers/mfd/twl6040.c
> +++ b/drivers/mfd/twl6040.c
> @@ -839,4 +839,3 @@ module_i2c_driver(twl6040_driver);
> MODULE_DESCRIPTION("TWL6040 MFD");
> MODULE_AUTHOR("Misael Lopez Cruz <misael.lopez@ti.com>");
> MODULE_AUTHOR("Jorge Eduardo Candelaria <jorge.candelaria@ti.com>");
> -MODULE_LICENSE("GPL");
> --
> 2.39.1.268.g9de2f9a303
>

--
Lee Jones [李琼斯]