diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-28 17:21:07 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-01 05:43:09 -0400 |
commit | e48b1b452ff630288c930fd8e0c2d808bc15f7ad (patch) | |
tree | 7ba5f83964a1d965d8b8b6187b39083e1a99dfd2 /arch/powerpc/kernel/vio.c | |
parent | a78bfbfcfaca64e6198f164c43a60afc8a50e2c6 (diff) |
[POWERPC] Replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/vio.c')
-rw-r--r-- | arch/powerpc/kernel/vio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c index f98867252ee2..b77f8af7ddde 100644 --- a/arch/powerpc/kernel/vio.c +++ b/arch/powerpc/kernel/vio.c | |||
@@ -139,7 +139,7 @@ static int vio_bus_remove(struct device *dev) | |||
139 | */ | 139 | */ |
140 | int vio_register_driver(struct vio_driver *viodrv) | 140 | int vio_register_driver(struct vio_driver *viodrv) |
141 | { | 141 | { |
142 | printk(KERN_DEBUG "%s: driver %s registering\n", __FUNCTION__, | 142 | printk(KERN_DEBUG "%s: driver %s registering\n", __func__, |
143 | viodrv->driver.name); | 143 | viodrv->driver.name); |
144 | 144 | ||
145 | /* fill in 'struct driver' fields */ | 145 | /* fill in 'struct driver' fields */ |
@@ -184,7 +184,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node) | |||
184 | /* we need the 'device_type' property, in order to match with drivers */ | 184 | /* we need the 'device_type' property, in order to match with drivers */ |
185 | if (of_node->type == NULL) { | 185 | if (of_node->type == NULL) { |
186 | printk(KERN_WARNING "%s: node %s missing 'device_type'\n", | 186 | printk(KERN_WARNING "%s: node %s missing 'device_type'\n", |
187 | __FUNCTION__, | 187 | __func__, |
188 | of_node->name ? of_node->name : "<unknown>"); | 188 | of_node->name ? of_node->name : "<unknown>"); |
189 | return NULL; | 189 | return NULL; |
190 | } | 190 | } |
@@ -192,7 +192,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node) | |||
192 | unit_address = of_get_property(of_node, "reg", NULL); | 192 | unit_address = of_get_property(of_node, "reg", NULL); |
193 | if (unit_address == NULL) { | 193 | if (unit_address == NULL) { |
194 | printk(KERN_WARNING "%s: node %s missing 'reg'\n", | 194 | printk(KERN_WARNING "%s: node %s missing 'reg'\n", |
195 | __FUNCTION__, | 195 | __func__, |
196 | of_node->name ? of_node->name : "<unknown>"); | 196 | of_node->name ? of_node->name : "<unknown>"); |
197 | return NULL; | 197 | return NULL; |
198 | } | 198 | } |
@@ -227,7 +227,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node) | |||
227 | /* register with generic device framework */ | 227 | /* register with generic device framework */ |
228 | if (device_register(&viodev->dev)) { | 228 | if (device_register(&viodev->dev)) { |
229 | printk(KERN_ERR "%s: failed to register device %s\n", | 229 | printk(KERN_ERR "%s: failed to register device %s\n", |
230 | __FUNCTION__, viodev->dev.bus_id); | 230 | __func__, viodev->dev.bus_id); |
231 | /* XXX free TCE table */ | 231 | /* XXX free TCE table */ |
232 | kfree(viodev); | 232 | kfree(viodev); |
233 | return NULL; | 233 | return NULL; |
@@ -258,7 +258,7 @@ static int __init vio_bus_init(void) | |||
258 | err = device_register(&vio_bus_device.dev); | 258 | err = device_register(&vio_bus_device.dev); |
259 | if (err) { | 259 | if (err) { |
260 | printk(KERN_WARNING "%s: device_register returned %i\n", | 260 | printk(KERN_WARNING "%s: device_register returned %i\n", |
261 | __FUNCTION__, err); | 261 | __func__, err); |
262 | return err; | 262 | return err; |
263 | } | 263 | } |
264 | 264 | ||