PCI: Remove MODULE_LICENSE so boolean drivers don't look like modules
Since 8b41fc4454
("kbuild: create modules.builtin without
Makefile.modbuiltin or tristate.conf"), MODULE_LICENSE declarations are
used to identify modules. As a consequence, MODULE_LICENSE in non-modules
causes modprobe to misidentify the object file as a module when it is not,
and modprobe might succeed rather than failing with a suitable error
message.
For tristate modules that can be either built-in or loaded at runtime,
modprobe succeeds in both cases:
# modprobe ext4
[exit status zero if CONFIG_EXT4_FS=y or =m]
For boolean modules like the Standard Hot Plug Controller driver (shpchp)
that cannot be loaded at runtime, modprobe should always fail like this:
# modprobe shpchp
modprobe: FATAL: Module shpchp not found in directory /lib/modules/...
[exit status non-zero regardless of CONFIG_HOTPLUG_PCI_SHPC]
but prior to this commit, shpchp_core.c contained MODULE_LICENSE, so
"modprobe shpchp" silently succeeded when it should have failed.
Remove MODULE_LICENSE in files that cannot be built as modules.
[bhelgaas: commit log, squash]
Suggested-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20230216152410.4312-1-nick.alcock@oracle.com/
Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Hitomi Hasegawa <hasegawa-hitomi@fujitsu.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
This commit is contained in:
parent
1b929c02af
commit
f98954b293
|
@ -450,4 +450,3 @@ static struct platform_driver histb_pcie_platform_driver = {
|
|||
module_platform_driver(histb_pcie_platform_driver);
|
||||
|
||||
MODULE_DESCRIPTION("HiSilicon STB PCIe host controller driver");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
|
|
@ -56,6 +56,5 @@ static struct platform_driver mobiveil_pcie_driver = {
|
|||
|
||||
builtin_platform_driver(mobiveil_pcie_driver);
|
||||
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_DESCRIPTION("Mobiveil PCIe host controller driver");
|
||||
MODULE_AUTHOR("Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>");
|
||||
|
|
|
@ -2814,4 +2814,3 @@ static struct platform_driver tegra_pcie_driver = {
|
|||
.remove = tegra_pcie_remove,
|
||||
};
|
||||
module_platform_driver(tegra_pcie_driver);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
|
@ -169,4 +169,3 @@ static struct platform_driver versatile_pci_driver = {
|
|||
module_platform_driver(versatile_pci_driver);
|
||||
|
||||
MODULE_DESCRIPTION("Versatile PCI driver");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
|
|
@ -324,4 +324,3 @@ static struct platform_driver hisi_pcie_error_handler_driver = {
|
|||
module_platform_driver(hisi_pcie_error_handler_driver);
|
||||
|
||||
MODULE_DESCRIPTION("HiSilicon HIP PCIe controller error handling driver");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
|
|
@ -1135,6 +1135,5 @@ static struct platform_driver mc_pcie_driver = {
|
|||
};
|
||||
|
||||
builtin_platform_driver(mc_pcie_driver);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("Microchip PCIe host controller driver");
|
||||
MODULE_AUTHOR("Daire McNamara <daire.mcnamara@microchip.com>");
|
||||
|
|
|
@ -728,4 +728,3 @@ module_exit(pci_ep_cfs_exit);
|
|||
|
||||
MODULE_DESCRIPTION("PCI EP CONFIGFS");
|
||||
MODULE_AUTHOR("Kishon Vijay Abraham I <kishon@ti.com>");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
|
|
@ -861,4 +861,3 @@ module_exit(pci_epc_exit);
|
|||
|
||||
MODULE_DESCRIPTION("PCI EPC Library");
|
||||
MODULE_AUTHOR("Kishon Vijay Abraham I <kishon@ti.com>");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
|
|
@ -260,4 +260,3 @@ EXPORT_SYMBOL_GPL(pci_epc_mem_free_addr);
|
|||
|
||||
MODULE_DESCRIPTION("PCI EPC Address Space Management");
|
||||
MODULE_AUTHOR("Kishon Vijay Abraham I <kishon@ti.com>");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
|
|
@ -568,4 +568,3 @@ module_exit(pci_epf_exit);
|
|||
|
||||
MODULE_DESCRIPTION("PCI EPF Library");
|
||||
MODULE_AUTHOR("Kishon Vijay Abraham I <kishon@ti.com>");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
|
|
@ -45,7 +45,6 @@ static struct acpiphp_attention_info *attention_info;
|
|||
|
||||
MODULE_AUTHOR(DRIVER_AUTHOR);
|
||||
MODULE_DESCRIPTION(DRIVER_DESC);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_PARM_DESC(disable, "disable acpiphp driver");
|
||||
module_param_named(disable, acpiphp_disabled, bool, 0444);
|
||||
|
||||
|
|
|
@ -32,7 +32,6 @@ int shpchp_poll_time;
|
|||
|
||||
MODULE_AUTHOR(DRIVER_AUTHOR);
|
||||
MODULE_DESCRIPTION(DRIVER_DESC);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
module_param(shpchp_debug, bool, 0644);
|
||||
module_param(shpchp_poll_mode, bool, 0644);
|
||||
|
|
Loading…
Reference in New Issue