drivers/hwmon/coretemp.c: remove unneeded #ifdef CONFIG_HOTPLUG_CPU

register_hotcpu_notifier() is designed to make these ifdefs unnecessary. Cc: Chen Gong <[email protected]> Cc: Rudolf Marek <[email protected]> Cc: Huaxu Wan <[email protected]> Cc: Jean Delvare <[email protected]> Cc: Guenter Roeck <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
mrcsosa · Aug 10, 2010 · 6b8e828 · 6b8e828
1 parent f3cffe4
commit 6b8e828
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
@@ -480,7 +480,6 @@ static int __cpuinit coretemp_device_add(unsigned int cpu)
 	return err;
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
 static void coretemp_device_remove(unsigned int cpu)
 {
 	struct pdev_entry *p, *n;
@@ -518,7 +517,6 @@ static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb,
 static struct notifier_block coretemp_cpu_notifier __refdata = {
 	.notifier_call = coretemp_cpu_callback,
 };
-#endif				/* !CONFIG_HOTPLUG_CPU */
 
 static int __init coretemp_init(void)
 {
@@ -552,9 +550,7 @@ static int __init coretemp_init(void)
 		goto exit_driver_unreg;
 	}
 
-#ifdef CONFIG_HOTPLUG_CPU
 	register_hotcpu_notifier(&coretemp_cpu_notifier);
-#endif
 	return 0;
 
 exit_driver_unreg: