diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2010-08-09 20:21:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-09 23:45:10 -0400 |
commit | 6b8e8282611ea35845dcff0cb321a7d735fc3155 (patch) | |
tree | 0189143d056f08af2178f4589dae9d307fecccb1 /drivers | |
parent | f3cffe4d1a20208da9bf2c9cc0a973bf091eb160 (diff) |
drivers/hwmon/coretemp.c: remove unneeded #ifdef CONFIG_HOTPLUG_CPU
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hwmon/coretemp.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index 49d74d091fbf..a92e28a35767 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c | |||
@@ -480,7 +480,6 @@ exit: | |||
480 | return err; | 480 | return err; |
481 | } | 481 | } |
482 | 482 | ||
483 | #ifdef CONFIG_HOTPLUG_CPU | ||
484 | static void coretemp_device_remove(unsigned int cpu) | 483 | static void coretemp_device_remove(unsigned int cpu) |
485 | { | 484 | { |
486 | struct pdev_entry *p, *n; | 485 | struct pdev_entry *p, *n; |
@@ -518,7 +517,6 @@ static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb, | |||
518 | static struct notifier_block coretemp_cpu_notifier __refdata = { | 517 | static struct notifier_block coretemp_cpu_notifier __refdata = { |
519 | .notifier_call = coretemp_cpu_callback, | 518 | .notifier_call = coretemp_cpu_callback, |
520 | }; | 519 | }; |
521 | #endif /* !CONFIG_HOTPLUG_CPU */ | ||
522 | 520 | ||
523 | static int __init coretemp_init(void) | 521 | static int __init coretemp_init(void) |
524 | { | 522 | { |
@@ -552,9 +550,7 @@ static int __init coretemp_init(void) | |||
552 | goto exit_driver_unreg; | 550 | goto exit_driver_unreg; |
553 | } | 551 | } |
554 | 552 | ||
555 | #ifdef CONFIG_HOTPLUG_CPU | ||
556 | register_hotcpu_notifier(&coretemp_cpu_notifier); | 553 | register_hotcpu_notifier(&coretemp_cpu_notifier); |
557 | #endif | ||
558 | return 0; | 554 | return 0; |
559 | 555 | ||
560 | exit_driver_unreg: | 556 | exit_driver_unreg: |