aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/macintosh')
-rw-r--r--drivers/macintosh/therm_pm72.c4
-rw-r--r--drivers/macintosh/windfarm_pm81.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index 8d0958c38b6b..4f50ee5767a2 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -630,12 +630,12 @@ static int read_eeprom(int cpu, struct mpu_data *out)
630 sprintf(nodename, "/u3@0,f8000000/i2c@f8001000/cpuid@a%d", cpu ? 2 : 0); 630 sprintf(nodename, "/u3@0,f8000000/i2c@f8001000/cpuid@a%d", cpu ? 2 : 0);
631 np = of_find_node_by_path(nodename); 631 np = of_find_node_by_path(nodename);
632 if (np == NULL) { 632 if (np == NULL) {
633 printk(KERN_ERR "therm_pm72: Failed to retreive cpuid node from device-tree\n"); 633 printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid node from device-tree\n");
634 return -ENODEV; 634 return -ENODEV;
635 } 635 }
636 data = (u8 *)get_property(np, "cpuid", &len); 636 data = (u8 *)get_property(np, "cpuid", &len);
637 if (data == NULL) { 637 if (data == NULL) {
638 printk(KERN_ERR "therm_pm72: Failed to retreive cpuid property from device-tree\n"); 638 printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid property from device-tree\n");
639 of_node_put(np); 639 of_node_put(np);
640 return -ENODEV; 640 return -ENODEV;
641 } 641 }
diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c
index 80ddf9776bde..eb69a601e765 100644
--- a/drivers/macintosh/windfarm_pm81.c
+++ b/drivers/macintosh/windfarm_pm81.c
@@ -26,7 +26,7 @@
26 * (typically the drive fan) 26 * (typically the drive fan)
27 * - the main control (first control) gets the target value scaled with 27 * - the main control (first control) gets the target value scaled with
28 * the first pair of factors, and is then modified as below 28 * the first pair of factors, and is then modified as below
29 * - the value of the target of the CPU Fan control loop is retreived, 29 * - the value of the target of the CPU Fan control loop is retrieved,
30 * scaled with the second pair of factors, and the max of that and 30 * scaled with the second pair of factors, and the max of that and
31 * the scaled target is applied to the main control. 31 * the scaled target is applied to the main control.
32 * 32 *