From d7d057a8a93a0614ecd992ff75105dc2ca851c10 Mon Sep 17 00:00:00 2001
From: Chen Gong <gong.chen@linux.intel.com>
Date: Fri, 8 Oct 2010 22:01:48 -0400
Subject: [PATCH] --- yaml --- r: 217101 b: refs/heads/master c:
 17c10d61c750619324ee2a46c5a9e03a435fe212 h: refs/heads/master i:   217099:
 bf08a487790a630f8c7f3cd053437ebda81ce83c v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/hwmon/coretemp.c    | 3 +--
 trunk/drivers/hwmon/pkgtemp.c     | 7 +------
 trunk/drivers/hwmon/via-cputemp.c | 7 +------
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index c9c62a5e9331..f159e169b807 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd53d08465a79d742a297be1d7d173f8a13972a6
+refs/heads/master: 17c10d61c750619324ee2a46c5a9e03a435fe212
diff --git a/trunk/drivers/hwmon/coretemp.c b/trunk/drivers/hwmon/coretemp.c
index b4aea20ea076..467488c278e9 100644
--- a/trunk/drivers/hwmon/coretemp.c
+++ b/trunk/drivers/hwmon/coretemp.c
@@ -566,9 +566,8 @@ static int __init coretemp_init(void)
 static void __exit coretemp_exit(void)
 {
 	struct pdev_entry *p, *n;
-#ifdef CONFIG_HOTPLUG_CPU
+
 	unregister_hotcpu_notifier(&coretemp_cpu_notifier);
-#endif
 	mutex_lock(&pdev_list_mutex);
 	list_for_each_entry_safe(p, n, &pdev_list, list) {
 		platform_device_unregister(p->pdev);
diff --git a/trunk/drivers/hwmon/pkgtemp.c b/trunk/drivers/hwmon/pkgtemp.c
index a8fc35e854c7..0798210590bc 100644
--- a/trunk/drivers/hwmon/pkgtemp.c
+++ b/trunk/drivers/hwmon/pkgtemp.c
@@ -339,7 +339,6 @@ static int __cpuinit pkgtemp_device_add(unsigned int cpu)
 	return err;
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
 static void __cpuinit pkgtemp_device_remove(unsigned int cpu)
 {
 	struct pdev_entry *p;
@@ -387,7 +386,6 @@ static int __cpuinit pkgtemp_cpu_callback(struct notifier_block *nfb,
 static struct notifier_block pkgtemp_cpu_notifier __refdata = {
 	.notifier_call = pkgtemp_cpu_callback,
 };
-#endif				/* !CONFIG_HOTPLUG_CPU */
 
 static int __init pkgtemp_init(void)
 {
@@ -411,9 +409,7 @@ static int __init pkgtemp_init(void)
 	}
 #endif
 
-#ifdef CONFIG_HOTPLUG_CPU
 	register_hotcpu_notifier(&pkgtemp_cpu_notifier);
-#endif
 	return 0;
 
 #ifndef CONFIG_HOTPLUG_CPU
@@ -427,9 +423,8 @@ static int __init pkgtemp_init(void)
 static void __exit pkgtemp_exit(void)
 {
 	struct pdev_entry *p, *n;
-#ifdef CONFIG_HOTPLUG_CPU
+
 	unregister_hotcpu_notifier(&pkgtemp_cpu_notifier);
-#endif
 	mutex_lock(&pdev_list_mutex);
 	list_for_each_entry_safe(p, n, &pdev_list, list) {
 		platform_device_unregister(p->pdev);
diff --git a/trunk/drivers/hwmon/via-cputemp.c b/trunk/drivers/hwmon/via-cputemp.c
index ba7839b29684..ec7fad747adc 100644
--- a/trunk/drivers/hwmon/via-cputemp.c
+++ b/trunk/drivers/hwmon/via-cputemp.c
@@ -235,7 +235,6 @@ static int __cpuinit via_cputemp_device_add(unsigned int cpu)
 	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 @@ static int __init via_cputemp_init(void)
 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);