[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>

diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index a24b09c27718b0f5ece5ae90ecc3ad0e059d49ed..b975b5b0e3d53dccf026e7959da2674f0fdc55b3 100644 (file)
--- 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 ecc76581930562a684e0c639b3b0132f8bfda037..e99ffe2140bf4dee5da6b01ba48d02b528d480df 100644 (file)
--- 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 2890ce3d6641c89b76583ebe26c04d0ad9313883..ec6921c54a0720167f8f8c583b560a94a06b44c8 100644 (file)
--- 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 73c59904697fa00eb1325aa61daa46950f549628..ab5a6f12e1f0a9a043ca80cdd5bd0155149e680b 100644 (file)
--- 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 6fbac308ded649ffcee13fbdacfe2ea04e55959e..431a685a15dd53e2ae3f3fc6cd8f95fec6d7d1b1 100644 (file)
--- 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 7651f278615a307dd701fe900a6bcc6b5fbf67bc..a128553b8413c88be9749d23e1cc09d73e07a74f 100644 (file)
--- 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 3096836d8bd3309e35b459d2684b6688838ff58e..45bb3c1dfeb12fd9b58a337fff8bbcef22c9b4aa 100644 (file)
--- 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 abdf068bc27f4cb9b7699d4a6b478725aa25c180..eca471bc85125626d32c011a820fd828f3124837 100644 (file)
--- 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 fb068f2eca4ad40aa46770f6a915a00b6540587f..e73a2b482a15cd55c2c726b4c503b7fbb0234dd1 100644 (file)
--- 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;
 };