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

Commit a8cedfec authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Greg Kroah-Hartman
Browse files

drivers/char: make hpet.c explicitly non-modular 



The Kconfig currently controlling compilation of this code is:

char/Kconfig:config HPET
char/Kconfig:   bool "HPET - High Precision Event Timer" if (X86 || IA64)

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

Lets remove the modular code that is essentially orphaned, 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 don't replace module.h with init.h since the file already has that.

Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code.

We leave some tags like MODULE_AUTHOR for documentation purposes.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ff6f4648

drivers/char/hpet.c

+3 −22
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
 */



#include <linux/interrupt.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/miscdevice.h>
@@ -1043,24 +1042,16 @@ static int hpet_acpi_add(struct acpi_device *device) 
	return hpet_alloc(&data);

}



static int hpet_acpi_remove(struct acpi_device *device)

{

	/* XXX need to unregister clocksource, dealloc mem, etc */

	return -EINVAL;

}



static const struct acpi_device_id hpet_device_ids[] = {

	{"PNP0103", 0},

	{"", 0},

};

MODULE_DEVICE_TABLE(acpi, hpet_device_ids);



static struct acpi_driver hpet_acpi_driver = {

	.name = "hpet",

	.ids = hpet_device_ids,

	.ops = {

		.add = hpet_acpi_add,

		.remove = hpet_acpi_remove,

		},

};
@@ -1086,19 +1077,9 @@ static int __init hpet_init(void) 


	return 0;

}

device_initcall(hpet_init);



static void __exit hpet_exit(void)

{

	acpi_bus_unregister_driver(&hpet_acpi_driver);



	if (sysctl_header)

		unregister_sysctl_table(sysctl_header);

	misc_deregister(&hpet_misc);



	return;

}



module_init(hpet_init);

module_exit(hpet_exit);

/*

MODULE_AUTHOR("Bob Picco <Robert.Picco@hp.com>");

MODULE_LICENSE("GPL");

*/