diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2006-07-12 07:39:43 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 07:55:04 +0200 |
| commit | 954a46e2d5aec6f59976ddeb1d232b486e59b54a (patch) | |
| tree | 4e34abf431de3d6a31036c1fdf33fa4dadeb2951 /drivers/char | |
| parent | [POWERPC] Constify & voidify get_property() (diff) | |
| download | linux-954a46e2d5aec6f59976ddeb1d232b486e59b54a.tar.xz linux-954a46e2d5aec6f59976ddeb1d232b486e59b54a.zip | |
[POWERPC] pseries: 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.
pseries platform changes.
Built for pseries_defconfig
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/hvc_vio.c | 4 | ||||
| -rw-r--r-- | drivers/char/hvsi.c | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c index 651e5d25f58b..cc95941148fb 100644 --- a/drivers/char/hvc_vio.c +++ b/drivers/char/hvc_vio.c @@ -141,7 +141,7 @@ static int hvc_find_vtys(void) for (vty = of_find_node_by_name(NULL, "vty"); vty != NULL; vty = of_find_node_by_name(vty, "vty")) { - uint32_t *vtermno; + const uint32_t *vtermno; /* We have statically defined space for only a certain number * of console adapters. @@ -149,7 +149,7 @@ static int hvc_find_vtys(void) if (num_found >= MAX_NR_HVC_CONSOLES) break; - vtermno = (uint32_t *)get_property(vty, "reg", NULL); + vtermno = get_property(vty, "reg", NULL); if (!vtermno) continue; diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c index 56612a2dca6b..542de0e51f35 100644 --- a/drivers/char/hvsi.c +++ b/drivers/char/hvsi.c @@ -1276,11 +1276,10 @@ static int __init hvsi_console_init(void) vty != NULL; vty = of_find_compatible_node(vty, "serial", "hvterm-protocol")) { struct hvsi_struct *hp; - uint32_t *vtermno; - uint32_t *irq; + const uint32_t *vtermno, *irq; - vtermno = (uint32_t *)get_property(vty, "reg", NULL); - irq = (uint32_t *)get_property(vty, "interrupts", NULL); + vtermno = get_property(vty, "reg", NULL); + irq = get_property(vty, "interrupts", NULL); if (!vtermno || !irq) continue; |