[POWERPC] Make struct property's value a void *

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

9 files changed, 15 insertions, 15 deletions

diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index a24b09c27718..b975b5b0e3d5 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -294,19 +294,19 @@ static unsigned long htab_base, kernel_end;
 static struct property htab_base_prop = {
         .name = "linux,htab-base",
         .length = sizeof(unsigned long),
-        .value = (unsigned char *)&htab_base,
+        .value = &htab_base,
 };
 
 static struct property htab_size_prop = {
         .name = "linux,htab-size",
         .length = sizeof(unsigned long),
-        .value = (unsigned char *)&htab_size_bytes,
+        .value = &htab_size_bytes,
 };
 
 static struct property kernel_end_prop = {
         .name = "linux,kernel-end",
         .length = sizeof(unsigned long),
-        .value = (unsigned char *)&kernel_end,
+        .value = &kernel_end,
 };
 
 static void __init export_htab_values(void)
@@ -335,7 +335,7 @@ static void __init export_htab_values(void)
 static struct property crashk_base_prop = {
         .name = "linux,crashkernel-base",
         .length = sizeof(unsigned long),
-        .value = (unsigned char *)&crashk_res.start,
+        .value = &crashk_res.start,
 };
 
 static unsigned long crashk_size;
@@ -343,7 +343,7 @@ static unsigned long crashk_size;
 static struct property crashk_size_prop = {
         .name = "linux,crashkernel-size",
         .length = sizeof(unsigned long),
-        .value = (unsigned char *)&crashk_size,
+        .value = &crashk_size,
 };
 
 static void __init export_crashk_values(void)
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index ecc765819305..e99ffe2140bf 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -1012,7 +1012,7 @@ pci_create_OF_bus_map(void)
                 memset(of_prop, -1, sizeof(struct property) + 256);
                 of_prop->name = "pci-OF-bus-map";
                 of_prop->length = 256;
-                of_prop->value = (unsigned char *)&of_prop[1];
+                of_prop->value = &of_prop[1];
                 prom_add_property(find_path_device("/"), of_prop);
         }
 }
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 2890ce3d6641..ec6921c54a07 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -390,12 +390,13 @@ static unsigned long __init unflatten_dt_node(unsigned long mem,
                 if (allnextpp) {
                         pp->name = "name";
                         pp->length = sz;
-                        pp->value = (unsigned char *)(pp + 1);
+                        pp->value = pp + 1;
                         *prev_pp = pp;
                         prev_pp = &pp->next;
                         memcpy(pp->value, ps, sz - 1);
                         ((char *)pp->value)[sz - 1] = 0;
-                        DBG("fixed up name for %s -> %s\n", pathp, pp->value);
+                        DBG("fixed up name for %s -> %s\n", pathp,
+                                (char *)pp->value);
                 }
         }
         if (allnextpp) {
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 73c59904697f..ab5a6f12e1f0 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -77,7 +77,7 @@ static void __init fixup_bus_range(struct device_node *bridge)
                                bridge->full_name);
                 return;
         }
-        bus_range = (int *)prop->value;
+        bus_range = prop->value;
         bus_range[1] = fixup_one_level_bus_range(bridge->child, bus_range[1]);
 }
 
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 6fbac308ded6..431a685a15dd 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -100,7 +100,7 @@ static void __init fixup_bus_range(struct device_node *bridge)
         if (prop == NULL || prop->length < 2 * sizeof(int))
                 return;
 
-        bus_range = (int *)prop->value;
+        bus_range = prop->value;
         bus_range[1] = fixup_one_level_bus_range(bridge->child, bus_range[1]);
 }
 
diff --git a/arch/powerpc/platforms/powermac/pfunc_core.c b/arch/powerpc/platforms/powermac/pfunc_core.c
index 7651f278615a..a128553b8413 100644
--- a/arch/powerpc/platforms/powermac/pfunc_core.c
+++ b/arch/powerpc/platforms/powermac/pfunc_core.c
@@ -692,8 +692,7 @@ static int pmf_add_functions(struct pmf_device *dev, void *driverdata)
                 name = pp->name + plen;
                 if (strlen(name) && pp->length >= 12)
                         count += pmf_add_function_prop(dev, driverdata, name,
-                                                       (u32 *)pp->value,
-                                                       pp->length);
+                                                       pp->value, pp->length);
         }
         return count;
 }
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 3096836d8bd3..45bb3c1dfeb1 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -952,7 +952,7 @@ static struct smu_sdbp_header *smu_create_sdb_partition(int id)
         prop->name = ((char *)prop) + tlen - 18;
         sprintf(prop->name, "sdb-partition-%02x", id);
         prop->length = len;
-        prop->value = (unsigned char *)hdr;
+        prop->value = hdr;
         prop->next = NULL;
 
         /* Read the datablock */
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index abdf068bc27f..eca471bc8512 100644
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -38,7 +38,7 @@ static int property_read_proc(char *page, char **start, off_t off,
                 n = count;
         else
                 *eof = 1;
-        memcpy(page, pp->value + off, n);
+        memcpy(page, (char *)pp->value + off, n);
         *start = page;
         return n;
 }
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h
index fb068f2eca4a..e73a2b482a15 100644
--- a/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
@@ -71,7 +71,7 @@ typedef u32 ihandle;
 struct property {
         char    *name;
         int     length;
-        unsigned char *value;
+        void    *value;
         struct property *next;
 };