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 14:11:21 -0700 |
commit | 17c10d61c750619324ee2a46c5a9e03a435fe212 (patch) | |
tree | 46bceacae951391c9d80e0b20734a88f273eb360 /drivers/hwmon/via-cputemp.c | |
parent | fd53d08465a79d742a297be1d7d173f8a13972a6 (diff) | |
download | kernel_samsung_smdk4412-17c10d61c750619324ee2a46c5a9e03a435fe212.tar.gz kernel_samsung_smdk4412-17c10d61c750619324ee2a46c5a9e03a435fe212.tar.bz2 kernel_samsung_smdk4412-17c10d61c750619324ee2a46c5a9e03a435fe212.zip |
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/via-cputemp.c')
-rw-r--r-- | drivers/hwmon/via-cputemp.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c index ba7839b2968..ec7fad747ad 100644 --- a/drivers/hwmon/via-cputemp.c +++ b/drivers/hwmon/via-cputemp.c @@ -235,7 +235,6 @@ exit: return err; } -#ifdef CONFIG_HOTPLUG_CPU static void __cpuinit via_cputemp_device_remove(unsigned int cpu) { struct pdev_entry *p, *n; @@ -270,7 +269,6 @@ static int __cpuinit via_cputemp_cpu_callback(struct notifier_block *nfb, static struct notifier_block via_cputemp_cpu_notifier __refdata = { .notifier_call = via_cputemp_cpu_callback, }; -#endif /* !CONFIG_HOTPLUG_CPU */ static int __init via_cputemp_init(void) { @@ -311,9 +309,7 @@ static int __init via_cputemp_init(void) goto exit_driver_unreg; } -#ifdef CONFIG_HOTPLUG_CPU register_hotcpu_notifier(&via_cputemp_cpu_notifier); -#endif return 0; exit_devices_unreg: @@ -333,9 +329,8 @@ exit: static void __exit via_cputemp_exit(void) { struct pdev_entry *p, *n; -#ifdef CONFIG_HOTPLUG_CPU + unregister_hotcpu_notifier(&via_cputemp_cpu_notifier); -#endif mutex_lock(&pdev_list_mutex); list_for_each_entry_safe(p, n, &pdev_list, list) { platform_device_unregister(p->pdev); |