aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2006-07-12 01:39:43 -0400
committerPaul Mackerras <paulus@samba.org>2006-07-31 01:55:04 -0400
commit954a46e2d5aec6f59976ddeb1d232b486e59b54a (patch)
tree4e34abf431de3d6a31036c1fdf33fa4dadeb2951 /drivers/char
parenta7f67bdf2c9f24509b8e81e0f35573b611987c80 (diff)
[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.c4
-rw-r--r--drivers/char/hvsi.c7
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)
141 141
142 for (vty = of_find_node_by_name(NULL, "vty"); vty != NULL; 142 for (vty = of_find_node_by_name(NULL, "vty"); vty != NULL;
143 vty = of_find_node_by_name(vty, "vty")) { 143 vty = of_find_node_by_name(vty, "vty")) {
144 uint32_t *vtermno; 144 const uint32_t *vtermno;
145 145
146 /* We have statically defined space for only a certain number 146 /* We have statically defined space for only a certain number
147 * of console adapters. 147 * of console adapters.
@@ -149,7 +149,7 @@ static int hvc_find_vtys(void)
149 if (num_found >= MAX_NR_HVC_CONSOLES) 149 if (num_found >= MAX_NR_HVC_CONSOLES)
150 break; 150 break;
151 151
152 vtermno = (uint32_t *)get_property(vty, "reg", NULL); 152 vtermno = get_property(vty, "reg", NULL);
153 if (!vtermno) 153 if (!vtermno)
154 continue; 154 continue;
155 155
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)
1276 vty != NULL; 1276 vty != NULL;
1277 vty = of_find_compatible_node(vty, "serial", "hvterm-protocol")) { 1277 vty = of_find_compatible_node(vty, "serial", "hvterm-protocol")) {
1278 struct hvsi_struct *hp; 1278 struct hvsi_struct *hp;
1279 uint32_t *vtermno; 1279 const uint32_t *vtermno, *irq;
1280 uint32_t *irq;
1281 1280
1282 vtermno = (uint32_t *)get_property(vty, "reg", NULL); 1281 vtermno = get_property(vty, "reg", NULL);
1283 irq = (uint32_t *)get_property(vty, "interrupts", NULL); 1282 irq = get_property(vty, "interrupts", NULL);
1284 if (!vtermno || !irq) 1283 if (!vtermno || !irq)
1285 continue; 1284 continue;
1286 1285