FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-04-03 08:22:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PCI: hotplug: Make core explicitly non-modular

Browse Source 
This code is not being built as a module by anyone:

  obj-$(CONFIG_HOTPLUG_PCI)           += pci_hotplug.o
  [...]
  pci_hotplug-objs                    := pci_hotplug_core.o

  drivers/pci/hotplug/Kconfig:menuconfig HOTPLUG_PCI
  drivers/pci/hotplug/Kconfig:  bool "Support for PCI Hotplug"

Remove uses of MODULE_DESCRIPTION(), MODULE_AUTHOR(), MODULE_LICENSE(),
etc., so that when reading the driver there is no doubt it is builtin-only.
The information is preserved in comments at the top of the file.

Remove orphaned exit function in cpci_hotplug_core.c.

Note that for non-modular code, module_init() translates to
device_initcall().  One could argue that we should use subsys_initcall()
here, but for now we stick with runtime equivalence.

We would delete module.h and just keep the moduleparam.h include (since the
file does use module_param), but there is a try_module_get and module_put
pairing that prevents us from doing that.

[bhelgaas: changelog]
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Scott Murray <scott@spiteful.org>
CC: Kristen Carlson Accardi <kristen@linux.intel.com>
This commit is contained in:
Paul Gortmaker 2016-08-24 16:57:51 -04:00 committed by Bjorn Helgaas
parent ff187e777c
commit 57b51b9adb
3 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/hotplug/cpci_hotplug.h
View File

@ -101,10 +101,8 @@ int cpci_unconfigure_slot(struct slot *slot);
#ifdef CONFIG_HOTPLUG_PCI_CPCI #ifdef CONFIG_HOTPLUG_PCI_CPCI
int cpci_hotplug_init(int debug); int cpci_hotplug_init(int debug);
void cpci_hotplug_exit(void);
#else #else
static inline int cpci_hotplug_init(int debug) { return 0; } static inline int cpci_hotplug_init(int debug) { return 0; }
static inline void cpci_hotplug_exit(void) { }
#endif #endif
#endif /* _CPCI_HOTPLUG_H */ #endif /* _CPCI_HOTPLUG_H */

10
drivers/pci/hotplug/cpci_hotplug_core.c
View File

@ -719,13 +719,3 @@ cpci_hotplug_init(int debug)
cpci_debug = debug; cpci_debug = debug;
return 0; return 0;
} }
void __exit
cpci_hotplug_exit(void)
{
/*
* Clean everything up.
*/
cpci_hp_stop();
cpci_hp_unregister_controller(controller);
}

18
drivers/pci/hotplug/pci_hotplug_core.c
View File

@ -25,7 +25,7 @@
* *
*/ */
#include <linux/module.h> #include <linux/module.h> /* try_module_get & module_put */
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
@ -537,17 +537,11 @@ static int __init pci_hotplug_init(void)
info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
return result; return result;
} }
device_initcall(pci_hotplug_init);
static void __exit pci_hotplug_exit(void) /*
{ * not really modular, but the easiest way to keep compat with existing
cpci_hotplug_exit(); * bootargs behaviour is to continue using module_param here.
} */
module_init(pci_hotplug_init);
module_exit(pci_hotplug_exit);
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
module_param(debug, bool, 0644); module_param(debug, bool, 0644);
MODULE_PARM_DESC(debug, "Debugging mode enabled or not"); MODULE_PARM_DESC(debug, "Debugging mode enabled or not");