Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (114 commits)
  [POWERPC] Fix ohare IDE irq workaround on old powermacs
  [POWERPC] EEH: Power4 systems sometimes need multiple resets.
  [POWERPC] Include <asm/mmu.h> in arch/powerpc/sysdev/fsl_soc.h for phys_addr_t.
  [POWERPC] Demacrofy arch/powerpc/platforms/maple/pci.c
  [POWERPC] Maple U3 HT - reject inappropriate config space access
  [POWERPC] Fix IPIC pending register assignments
  [POWERPC] powerpc: fix building gdb against asm/ptrace.h
  [POWERPC] Remove DISCONTIGMEM cruft from page.h
  [POWERPC] Merge iSeries i/o operations with the rest
  [POWERPC] 40x: Fix debug status register defines
  [POWERPC] Fix compile error in sbc8560
  [POWERPC] EEH: support MMIO enable recovery step
  [POWERPC] EEH: enable MMIO/DMA on frozen slot
  [POWERPC] EEH: code comment cleanup
  [POWERPC] EEH: balance pcidev_get/put calls
  [POWERPC] PPC: Fix xmon stack frame address in backtrace
  [POWERPC] Add AT_PLATFORM value for Xilinx Virtex-4 FX
  [POWERPC] Start arch/powerpc/boot code reorganization
  [POWERPC] Define of_read_ulong helper
  [POWERPC] iseries: eliminate a couple of warnings
  ...

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/macintosh/windfarm_smu_controls.c b/drivers/macintosh/windfarm_smu_controls.c
index a9e88edc0c72..bff1f372f188 100644
--- a/drivers/macintosh/windfarm_smu_controls.c
+++ b/drivers/macintosh/windfarm_smu_controls.c
@@ -159,14 +159,15 @@ static struct smu_fan_control *smu_fan_create(struct device_node *node,
                                               int pwm_fan)
 {
         struct smu_fan_control *fct;
-        s32 *v; u32 *reg;
-        char *l;
+        const s32 *v;
+        const u32 *reg;
+        const char *l;
 
         fct = kmalloc(sizeof(struct smu_fan_control), GFP_KERNEL);
         if (fct == NULL)
                 return NULL;
         fct->ctrl.ops = &smu_fan_ops;
-        l = (char *)get_property(node, "location", NULL);
+        l = get_property(node, "location", NULL);
         if (l == NULL)
                 goto fail;
 
@@ -223,17 +224,17 @@ static struct smu_fan_control *smu_fan_create(struct device_node *node,
                 goto fail;
 
         /* Get min & max values*/
-        v = (s32 *)get_property(node, "min-value", NULL);
+        v = get_property(node, "min-value", NULL);
         if (v == NULL)
                 goto fail;
         fct->min = *v;
-        v = (s32 *)get_property(node, "max-value", NULL);
+        v = get_property(node, "max-value", NULL);
         if (v == NULL)
                 goto fail;
         fct->max = *v;
 
         /* Get "reg" value */
-        reg = (u32 *)get_property(node, "reg", NULL);
+        reg = get_property(node, "reg", NULL);
         if (reg == NULL)
                 goto fail;
         fct->reg = *reg;