1 files changed, 14 insertions, 13 deletions

diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c
index 7b1156ea53..d30466d741 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_64.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_64.c
@@ -89,7 +89,7 @@ static DEFINE_MUTEX(g5_switch_mutex);
 
 #ifdef CONFIG_PMAC_SMU
 
-static u32 *g5_pmode_data;
+static const u32 *g5_pmode_data;
 static int g5_pmode_max;
 
 static struct smu_sdbp_fvt *g5_fvt_table;       /* table of op. points */
@@ -391,7 +391,8 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
         unsigned int psize, ssize;
         unsigned long max_freq;
         char *freq_method, *volt_method;
-        u32 *valp, pvr_hi;
+        const u32 *valp;
+        u32 pvr_hi;
         int use_volts_vdnap = 0;
         int use_volts_smu = 0;
         int rc = -ENODEV;
@@ -409,8 +410,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
         /* Get first CPU node */
         for (cpunode = NULL;
              (cpunode = of_get_next_child(cpus, cpunode)) != NULL;) {
-                u32 *reg =
-                        (u32 *)get_property(cpunode, "reg", NULL);
+                const u32 *reg = get_property(cpunode, "reg", NULL);
                 if (reg == NULL || (*reg) != 0)
                         continue;
                 if (!strcmp(cpunode->type, "cpu"))
@@ -422,7 +422,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
         }
 
         /* Check 970FX for now */
-        valp = (u32 *)get_property(cpunode, "cpu-version", NULL);
+        valp = get_property(cpunode, "cpu-version", NULL);
         if (!valp) {
                 DBG("No cpu-version property !\n");
                 goto bail_noprops;
@@ -434,7 +434,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
         }
 
         /* Look for the powertune data in the device-tree */
-        g5_pmode_data = (u32 *)get_property(cpunode, "power-mode-data",&psize);
+        g5_pmode_data = get_property(cpunode, "power-mode-data",&psize);
         if (!g5_pmode_data) {
                 DBG("No power-mode-data !\n");
                 goto bail_noprops;
@@ -442,7 +442,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
         g5_pmode_max = psize / sizeof(u32) - 1;
 
         if (use_volts_smu) {
-                struct smu_sdbp_header *shdr;
+                const struct smu_sdbp_header *shdr;
 
                 /* Look for the FVT table */
                 shdr = smu_get_sdb_partition(SMU_SDB_FVT_ID, NULL);
@@ -493,7 +493,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
          * half freq in this version. So far, I haven't yet seen a machine
          * supporting anything else.
          */
-        valp = (u32 *)get_property(cpunode, "clock-frequency", NULL);
+        valp = get_property(cpunode, "clock-frequency", NULL);
         if (!valp)
                 return -ENODEV;
         max_freq = (*valp)/1000;
@@ -541,8 +541,8 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
 static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
 {
         struct device_node *cpuid = NULL, *hwclock = NULL, *cpunode = NULL;
-        u8 *eeprom = NULL;
-        u32 *valp;
+        const u8 *eeprom = NULL;
+        const u32 *valp;
         u64 max_freq, min_freq, ih, il;
         int has_volt = 1, rc = 0;
 
@@ -563,7 +563,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
         /* Lookup the cpuid eeprom node */
         cpuid = of_find_node_by_path("/u3@0,f8000000/i2c@f8001000/cpuid@a0");
         if (cpuid != NULL)
-                eeprom = (u8 *)get_property(cpuid, "cpuid", NULL);
+                eeprom = get_property(cpuid, "cpuid", NULL);
         if (eeprom == NULL) {
                 printk(KERN_ERR "cpufreq: Can't find cpuid EEPROM !\n");
                 rc = -ENODEV;
@@ -573,7 +573,8 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
         /* Lookup the i2c hwclock */
         for (hwclock = NULL;
              (hwclock = of_find_node_by_name(hwclock, "i2c-hwclock")) != NULL;){
-                char *loc = get_property(hwclock, "hwctrl-location", NULL);
+                const char *loc = get_property(hwclock,
+                                "hwctrl-location", NULL);
                 if (loc == NULL)
                         continue;
                 if (strcmp(loc, "CPU CLOCK"))
@@ -637,7 +638,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
          */
 
         /* Get max frequency from device-tree */
-        valp = (u32 *)get_property(cpunode, "clock-frequency", NULL);
+        valp = get_property(cpunode, "clock-frequency", NULL);
         if (!valp) {
                 printk(KERN_ERR "cpufreq: Can't find CPU frequency !\n");
                 rc = -ENODEV;