diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-08-16 01:24:28 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-24 23:27:35 -0400 |
| commit | a0a428e30077fd64c39aadf5221cf2c7a14dc281 (patch) | |
| tree | dbdc1172b705b8f1576fb43bebd2fbc83ee83995 | |
| parent | 9a2ded55c40ad17b8b12f87c592a40b2e8593c4d (diff) | |
[POWERPC] iseries: remove const warning
Just one bit of fallout from the constification of the get_property
return value.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/platforms/iseries/viopath.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c index efeb6ae9df64..9baa4ee82592 100644 --- a/arch/powerpc/platforms/iseries/viopath.c +++ b/arch/powerpc/platforms/iseries/viopath.c | |||
| @@ -117,6 +117,7 @@ static int proc_viopath_show(struct seq_file *m, void *v) | |||
| 117 | HvLpEvent_Rc hvrc; | 117 | HvLpEvent_Rc hvrc; |
| 118 | DECLARE_MUTEX_LOCKED(Semaphore); | 118 | DECLARE_MUTEX_LOCKED(Semaphore); |
| 119 | struct device_node *node; | 119 | struct device_node *node; |
| 120 | const char *sysid; | ||
| 120 | 121 | ||
| 121 | buf = kmalloc(HW_PAGE_SIZE, GFP_KERNEL); | 122 | buf = kmalloc(HW_PAGE_SIZE, GFP_KERNEL); |
| 122 | if (!buf) | 123 | if (!buf) |
| @@ -152,15 +153,15 @@ static int proc_viopath_show(struct seq_file *m, void *v) | |||
| 152 | seq_printf(m, "AVAILABLE_VETH=%x\n", vlanMap); | 153 | seq_printf(m, "AVAILABLE_VETH=%x\n", vlanMap); |
| 153 | 154 | ||
| 154 | node = of_find_node_by_path("/"); | 155 | node = of_find_node_by_path("/"); |
| 155 | buf = NULL; | 156 | sysid = NULL; |
| 156 | if (node != NULL) | 157 | if (node != NULL) |
| 157 | buf = get_property(node, "system-id", NULL); | 158 | sysid = get_property(node, "system-id", NULL); |
| 158 | 159 | ||
| 159 | if (buf == NULL) | 160 | if (sysid == NULL) |
| 160 | seq_printf(m, "SRLNBR=<UNKNOWN>\n"); | 161 | seq_printf(m, "SRLNBR=<UNKNOWN>\n"); |
| 161 | else | 162 | else |
| 162 | /* Skip "IBM," on front of serial number, see dt.c */ | 163 | /* Skip "IBM," on front of serial number, see dt.c */ |
| 163 | seq_printf(m, "SRLNBR=%s\n", buf + 4); | 164 | seq_printf(m, "SRLNBR=%s\n", sysid + 4); |
| 164 | 165 | ||
| 165 | of_node_put(node); | 166 | of_node_put(node); |
| 166 | 167 | ||
