aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2010-08-10 21:01:08 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 11:58:59 -0400
commit37713308d89f17c0f73e88b07138d6ca20bfe686 (patch)
tree9a968f32d60cb85e6fe1f744e6e8985eae6347c4 /drivers/hwmon
parent241a6a542b908c0332ff00d967df459dbc5d372f (diff)
fix "hwmon: coretemp: update hotplug condition check"
In commit 0dca94baeab4 ("hwmon: coretemp: update hotplug condition check") we merged v2 of this patch. Update that to v3. The difference is to remove the new and unnecesary references to CPU_*_FROZEN. Cc: "Rafael J. Wysocki" <rjw@sisk.pl> 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/hwmon')
-rw-r--r--drivers/hwmon/coretemp.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index a92e28a35767..c070c9714cbe 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -501,13 +501,10 @@ static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb,
501 501
502 switch (action) { 502 switch (action) {
503 case CPU_ONLINE: 503 case CPU_ONLINE:
504 case CPU_ONLINE_FROZEN:
505 case CPU_DOWN_FAILED: 504 case CPU_DOWN_FAILED:
506 case CPU_DOWN_FAILED_FROZEN:
507 coretemp_device_add(cpu); 505 coretemp_device_add(cpu);
508 break; 506 break;
509 case CPU_DOWN_PREPARE: 507 case CPU_DOWN_PREPARE:
510 case CPU_DOWN_PREPARE_FROZEN:
511 coretemp_device_remove(cpu); 508 coretemp_device_remove(cpu);
512 break; 509 break;
513 } 510 }