git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
hwmon
/
coretemp.c
diff --git
a/drivers/hwmon/coretemp.c
b/drivers/hwmon/coretemp.c
index 6f66551d9e51ab00f787dfe5c2d5d9182affd4bc..3ee60d26e3a2e5cbad5e08a6c83353059f43a524 100644
(file)
--- a/
drivers/hwmon/coretemp.c
+++ b/
drivers/hwmon/coretemp.c
@@
-150,7
+150,7
@@
static struct coretemp_data *coretemp_update_device(struct device *dev)
static int __devinit coretemp_probe(struct platform_device *pdev)
{
struct coretemp_data *data;
static int __devinit coretemp_probe(struct platform_device *pdev)
{
struct coretemp_data *data;
- struct cpuinfo_x86 *c = &
(cpu_data)[pdev->id]
;
+ struct cpuinfo_x86 *c = &
cpu_data(pdev->id)
;
int err;
u32 eax, edx;
int err;
u32 eax, edx;
@@
-337,11
+337,10
@@
static int coretemp_cpu_callback(struct notifier_block *nfb,
switch (action) {
case CPU_ONLINE:
switch (action) {
case CPU_ONLINE:
- case CPU_
ONLINE_FROZEN
:
+ case CPU_
DOWN_FAILED
:
coretemp_device_add(cpu);
break;
coretemp_device_add(cpu);
break;
- case CPU_DEAD:
- case CPU_DEAD_FROZEN:
+ case CPU_DOWN_PREPARE:
coretemp_device_remove(cpu);
break;
}
coretemp_device_remove(cpu);
break;
}
@@
-359,7
+358,7
@@
static int __init coretemp_init(void)
struct pdev_entry *p, *n;
/* quick check if we run Intel */
struct pdev_entry *p, *n;
/* quick check if we run Intel */
- if (cpu_data
[0]
.x86_vendor != X86_VENDOR_INTEL)
+ if (cpu_data
(0)
.x86_vendor != X86_VENDOR_INTEL)
goto exit;
err = platform_driver_register(&coretemp_driver);
goto exit;
err = platform_driver_register(&coretemp_driver);
@@
-367,7
+366,7
@@
static int __init coretemp_init(void)
goto exit;
for_each_online_cpu(i) {
goto exit;
for_each_online_cpu(i) {
- struct cpuinfo_x86 *c = &
(cpu_data)[i]
;
+ struct cpuinfo_x86 *c = &
cpu_data(i)
;
/* check if family 6, models e, f, 16 */
if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
/* check if family 6, models e, f, 16 */
if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||