lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
register_hotcpu_notifier() is designed to make these ifdefs unnecessary.

Cc: Chen Gong <gong.chen@linux.intel.com>
Cc: Rudolf Marek <r.marek@assembler.cz>
Cc: Huaxu Wan <huaxu.wan@intel.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton
2010-08-09 17:21:11 -07:00
committed by Linus Torvalds
parent f3cffe4d1a
commit 6b8e828261
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hwmon/coretemp.c
View File

@@ -480,7 +480,6 @@ exit:
return err; return err;
} }
#ifdef CONFIG_HOTPLUG_CPU
static void coretemp_device_remove(unsigned int cpu) static void coretemp_device_remove(unsigned int cpu)
{ {
struct pdev_entry *p, *n; 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 = { static struct notifier_block coretemp_cpu_notifier __refdata = {
.notifier_call = coretemp_cpu_callback, .notifier_call = coretemp_cpu_callback,
}; };
#endif /* !CONFIG_HOTPLUG_CPU */
static int __init coretemp_init(void) static int __init coretemp_init(void)
{ {
@@ -552,9 +550,7 @@ static int __init coretemp_init(void)
goto exit_driver_unreg; goto exit_driver_unreg;
} }
#ifdef CONFIG_HOTPLUG_CPU
register_hotcpu_notifier(&coretemp_cpu_notifier); register_hotcpu_notifier(&coretemp_cpu_notifier);
#endif
return 0; return 0;
exit_driver_unreg: exit_driver_unreg: