Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e971aa2c authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Ingo Molnar
Browse files

x86/platform: Make atom/pmc_atom.c explicitly non-modular 



The Kconfig currently controlling compilation of this code is:

config PMC_ATOM
        def_bool y

...meaning that it currently is not being built as a module by
anyone.

Lets remove the couple traces of modularity so that when reading
the driver there is no doubt it is builtin-only.

Since module_init() translates to device_initcall() in the
non-modular case, the init ordering remains unchanged with this
commit.

We leave some tags like MODULE_AUTHOR() for documentation
purposes.

Also note that MODULE_DEVICE_TABLE() is a no-op for non-modular
code. We correct a comment that indicates the data was only used
by that macro, as it actually is used by the code directly.

Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1440459295-21814-2-git-send-email-paul.gortmaker@windriver.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 88c9281a

arch/x86/platform/atom/pmc_atom.c

+4 −9
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/init.h>

#include <linux/pci.h>

#include <linux/device.h>
@@ -422,10 +421,7 @@ static int pmc_setup_dev(struct pci_dev *pdev, const struct pci_device_id *ent) 
/*

 * Data for PCI driver interface

 *

 * This data only exists for exporting the supported

 * PCI ids via MODULE_DEVICE_TABLE.  We do not actually

 * register a pci_driver, because lpc_ich will register

 * a driver on the same PCI id.

 * used by pci_match_id() call below.

 */

static const struct pci_device_id pmc_pci_ids[] = {

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_VLV_PMC), (kernel_ulong_t)&byt_reg_map },
@@ -433,8 +429,6 @@ static const struct pci_device_id pmc_pci_ids[] = { 
	{ 0, },

};



MODULE_DEVICE_TABLE(pci, pmc_pci_ids);



static int __init pmc_atom_init(void)

{

	struct pci_dev *pdev = NULL;
@@ -457,9 +451,10 @@ static int __init pmc_atom_init(void) 
	return -ENODEV;

}



module_init(pmc_atom_init);

/* no module_exit, this driver shouldn't be unloaded */

device_initcall(pmc_atom_init);



/*

MODULE_AUTHOR("Aubrey Li <aubrey.li@linux.intel.com>");

MODULE_DESCRIPTION("Intel Atom SOC Power Management Controller Interface");

MODULE_LICENSE("GPL v2");

*/