[POWERPC] Constify & voidify get_property()

Now that get_property() returns a void *, there's no need to cast its
return value. Also, treat the return value as const, so we can
constify get_property later.

powerpc core changes.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 18 insertions, 17 deletions

diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 359ab89748e0..ee1e0b8c7f1f 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -39,16 +39,17 @@ static int __init add_legacy_port(struct device_node *np, int want_index,
                                   phys_addr_t taddr, unsigned long irq,
                                   upf_t flags, int irq_check_parent)
 {
-        u32 *clk, *spd, clock = BASE_BAUD * 16;
+        const u32 *clk, *spd;
+        u32 clock = BASE_BAUD * 16;
         int index;
 
         /* get clock freq. if present */
-        clk = (u32 *)get_property(np, "clock-frequency", NULL);
+        clk = get_property(np, "clock-frequency", NULL);
         if (clk && *clk)
                 clock = *clk;
 
         /* get default speed if present */
-        spd = (u32 *)get_property(np, "current-speed", NULL);
+        spd = get_property(np, "current-speed", NULL);
 
         /* If we have a location index, then try to use it */
         if (want_index >= 0 && want_index < MAX_LEGACY_SERIAL_PORTS)
@@ -113,7 +114,7 @@ static int __init add_legacy_soc_port(struct device_node *np,
                                       struct device_node *soc_dev)
 {
         u64 addr;
-        u32 *addrp;
+        const u32 *addrp;
         upf_t flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ;
 
         /* We only support ports that have a clock frequency properly
@@ -140,15 +141,15 @@ static int __init add_legacy_soc_port(struct device_node *np,
 static int __init add_legacy_isa_port(struct device_node *np,
                                       struct device_node *isa_brg)
 {
-        u32 *reg;
-        char *typep;
+        const u32 *reg;
+        const char *typep;
         int index = -1;
         u64 taddr;
 
         DBG(" -> add_legacy_isa_port(%s)\n", np->full_name);
 
         /* Get the ISA port number */
-        reg = (u32 *)get_property(np, "reg", NULL);
+        reg = get_property(np, "reg", NULL);
         if (reg == NULL)
                 return -1;
 
@@ -159,7 +160,7 @@ static int __init add_legacy_isa_port(struct device_node *np,
         /* Now look for an "ibm,aix-loc" property that gives us ordering
          * if any...
          */
-        typep = (char *)get_property(np, "ibm,aix-loc", NULL);
+        typep = get_property(np, "ibm,aix-loc", NULL);
 
         /* If we have a location index, then use it */
         if (typep && *typep == 'S')
@@ -184,7 +185,7 @@ static int __init add_legacy_pci_port(struct device_node *np,
                                       struct device_node *pci_dev)
 {
         u64 addr, base;
-        u32 *addrp;
+        const u32 *addrp;
         unsigned int flags;
         int iotype, index = -1, lindex = 0;
 
@@ -223,7 +224,7 @@ static int __init add_legacy_pci_port(struct device_node *np,
          * we get to their "reg" property
          */
         if (np != pci_dev) {
-                u32 *reg = (u32 *)get_property(np, "reg", NULL);
+                const u32 *reg = get_property(np, "reg", NULL);
                 if (reg && (*reg < 4))
                         index = lindex = *reg;
         }
@@ -281,13 +282,13 @@ static void __init setup_legacy_serial_console(int console)
 void __init find_legacy_serial_ports(void)
 {
         struct device_node *np, *stdout = NULL;
-        char *path;
+        const char *path;
         int index;
 
         DBG(" -> find_legacy_serial_port()\n");
 
         /* Now find out if one of these is out firmware console */
-        path = (char *)get_property(of_chosen, "linux,stdout-path", NULL);
+        path = get_property(of_chosen, "linux,stdout-path", NULL);
         if (path != NULL) {
                 stdout = of_find_node_by_path(path);
                 if (stdout)
@@ -487,8 +488,8 @@ static int __init check_legacy_serial_console(void)
 {
         struct device_node *prom_stdout = NULL;
         int speed = 0, offset = 0;
-        char *name;
-        u32 *spd;
+        const char *name;
+        const u32 *spd;
 
         DBG(" -> check_legacy_serial_console()\n");
 
@@ -509,7 +510,7 @@ static int __init check_legacy_serial_console(void)
         }
         /* We are getting a weird phandle from OF ... */
         /* ... So use the full path instead */
-        name = (char *)get_property(of_chosen, "linux,stdout-path", NULL);
+        name = get_property(of_chosen, "linux,stdout-path", NULL);
         if (name == NULL) {
                 DBG(" no linux,stdout-path !\n");
                 return -ENODEV;
@@ -521,12 +522,12 @@ static int __init check_legacy_serial_console(void)
         }
         DBG("stdout is %s\n", prom_stdout->full_name);
 
-        name = (char *)get_property(prom_stdout, "name", NULL);
+        name = get_property(prom_stdout, "name", NULL);
         if (!name) {
                 DBG(" stdout package has no name !\n");
                 goto not_found;
         }
-        spd = (u32 *)get_property(prom_stdout, "current-speed", NULL);
+        spd = get_property(prom_stdout, "current-speed", NULL);
         if (spd)
                 speed = *spd;