diff options
author | Chen Gong <gong.chen@linux.intel.com> | 2010-10-08 22:01:48 -0400 |
---|---|---|
committer | Guenter Roeck <guenter.roeck@ericsson.com> | 2010-10-25 17:11:21 -0400 |
commit | 17c10d61c750619324ee2a46c5a9e03a435fe212 (patch) | |
tree | 46bceacae951391c9d80e0b20734a88f273eb360 /drivers/hwmon/pkgtemp.c | |
parent | fd53d08465a79d742a297be1d7d173f8a13972a6 (diff) |
hwmon: ({core, pkg, via-cpu}temp) remove unnecessary CONFIG_HOTPLUG_CPU ifdefs
CONFIG_HOTPLUG_CPU is used too much in some drivers.
This patch clean them up.
Signed-off-by: Chen Gong <gong.chen@linux.intel.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Diffstat (limited to 'drivers/hwmon/pkgtemp.c')
-rw-r--r-- | drivers/hwmon/pkgtemp.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/hwmon/pkgtemp.c b/drivers/hwmon/pkgtemp.c index a8fc35e854c7..0798210590bc 100644 --- a/drivers/hwmon/pkgtemp.c +++ b/drivers/hwmon/pkgtemp.c | |||
@@ -339,7 +339,6 @@ exit: | |||
339 | return err; | 339 | return err; |
340 | } | 340 | } |
341 | 341 | ||
342 | #ifdef CONFIG_HOTPLUG_CPU | ||
343 | static void __cpuinit pkgtemp_device_remove(unsigned int cpu) | 342 | static void __cpuinit pkgtemp_device_remove(unsigned int cpu) |
344 | { | 343 | { |
345 | struct pdev_entry *p; | 344 | struct pdev_entry *p; |
@@ -387,7 +386,6 @@ static int __cpuinit pkgtemp_cpu_callback(struct notifier_block *nfb, | |||
387 | static struct notifier_block pkgtemp_cpu_notifier __refdata = { | 386 | static struct notifier_block pkgtemp_cpu_notifier __refdata = { |
388 | .notifier_call = pkgtemp_cpu_callback, | 387 | .notifier_call = pkgtemp_cpu_callback, |
389 | }; | 388 | }; |
390 | #endif /* !CONFIG_HOTPLUG_CPU */ | ||
391 | 389 | ||
392 | static int __init pkgtemp_init(void) | 390 | static int __init pkgtemp_init(void) |
393 | { | 391 | { |
@@ -411,9 +409,7 @@ static int __init pkgtemp_init(void) | |||
411 | } | 409 | } |
412 | #endif | 410 | #endif |
413 | 411 | ||
414 | #ifdef CONFIG_HOTPLUG_CPU | ||
415 | register_hotcpu_notifier(&pkgtemp_cpu_notifier); | 412 | register_hotcpu_notifier(&pkgtemp_cpu_notifier); |
416 | #endif | ||
417 | return 0; | 413 | return 0; |
418 | 414 | ||
419 | #ifndef CONFIG_HOTPLUG_CPU | 415 | #ifndef CONFIG_HOTPLUG_CPU |
@@ -427,9 +423,8 @@ exit: | |||
427 | static void __exit pkgtemp_exit(void) | 423 | static void __exit pkgtemp_exit(void) |
428 | { | 424 | { |
429 | struct pdev_entry *p, *n; | 425 | struct pdev_entry *p, *n; |
430 | #ifdef CONFIG_HOTPLUG_CPU | 426 | |
431 | unregister_hotcpu_notifier(&pkgtemp_cpu_notifier); | 427 | unregister_hotcpu_notifier(&pkgtemp_cpu_notifier); |
432 | #endif | ||
433 | mutex_lock(&pdev_list_mutex); | 428 | mutex_lock(&pdev_list_mutex); |
434 | list_for_each_entry_safe(p, n, &pdev_list, list) { | 429 | list_for_each_entry_safe(p, n, &pdev_list, list) { |
435 | platform_device_unregister(p->pdev); | 430 | platform_device_unregister(p->pdev); |