diff options
Diffstat (limited to 'arch/powerpc/kernel/ibmebus.c')
-rw-r--r-- | arch/powerpc/kernel/ibmebus.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c index 2f50bb5d00f9..9971159c8040 100644 --- a/arch/powerpc/kernel/ibmebus.c +++ b/arch/powerpc/kernel/ibmebus.c | |||
@@ -183,7 +183,7 @@ static int ibmebus_create_devices(const struct of_device_id *matches) | |||
183 | ret = ibmebus_create_device(child); | 183 | ret = ibmebus_create_device(child); |
184 | if (ret) { | 184 | if (ret) { |
185 | printk(KERN_ERR "%s: failed to create device (%i)", | 185 | printk(KERN_ERR "%s: failed to create device (%i)", |
186 | __FUNCTION__, ret); | 186 | __func__, ret); |
187 | of_node_put(child); | 187 | of_node_put(child); |
188 | break; | 188 | break; |
189 | } | 189 | } |
@@ -269,7 +269,7 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus, | |||
269 | if (bus_find_device(&ibmebus_bus_type, NULL, path, | 269 | if (bus_find_device(&ibmebus_bus_type, NULL, path, |
270 | ibmebus_match_path)) { | 270 | ibmebus_match_path)) { |
271 | printk(KERN_WARNING "%s: %s has already been probed\n", | 271 | printk(KERN_WARNING "%s: %s has already been probed\n", |
272 | __FUNCTION__, path); | 272 | __func__, path); |
273 | rc = -EEXIST; | 273 | rc = -EEXIST; |
274 | goto out; | 274 | goto out; |
275 | } | 275 | } |
@@ -279,7 +279,7 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus, | |||
279 | of_node_put(dn); | 279 | of_node_put(dn); |
280 | } else { | 280 | } else { |
281 | printk(KERN_WARNING "%s: no such device node: %s\n", | 281 | printk(KERN_WARNING "%s: no such device node: %s\n", |
282 | __FUNCTION__, path); | 282 | __func__, path); |
283 | rc = -ENODEV; | 283 | rc = -ENODEV; |
284 | } | 284 | } |
285 | 285 | ||
@@ -308,7 +308,7 @@ static ssize_t ibmebus_store_remove(struct bus_type *bus, | |||
308 | return count; | 308 | return count; |
309 | } else { | 309 | } else { |
310 | printk(KERN_WARNING "%s: %s not on the bus\n", | 310 | printk(KERN_WARNING "%s: %s not on the bus\n", |
311 | __FUNCTION__, path); | 311 | __func__, path); |
312 | 312 | ||
313 | kfree(path); | 313 | kfree(path); |
314 | return -ENODEV; | 314 | return -ENODEV; |
@@ -337,14 +337,14 @@ static int __init ibmebus_bus_init(void) | |||
337 | err = of_bus_type_init(&ibmebus_bus_type, "ibmebus"); | 337 | err = of_bus_type_init(&ibmebus_bus_type, "ibmebus"); |
338 | if (err) { | 338 | if (err) { |
339 | printk(KERN_ERR "%s: failed to register IBM eBus.\n", | 339 | printk(KERN_ERR "%s: failed to register IBM eBus.\n", |
340 | __FUNCTION__); | 340 | __func__); |
341 | return err; | 341 | return err; |
342 | } | 342 | } |
343 | 343 | ||
344 | err = device_register(&ibmebus_bus_device); | 344 | err = device_register(&ibmebus_bus_device); |
345 | if (err) { | 345 | if (err) { |
346 | printk(KERN_WARNING "%s: device_register returned %i\n", | 346 | printk(KERN_WARNING "%s: device_register returned %i\n", |
347 | __FUNCTION__, err); | 347 | __func__, err); |
348 | bus_unregister(&ibmebus_bus_type); | 348 | bus_unregister(&ibmebus_bus_type); |
349 | 349 | ||
350 | return err; | 350 | return err; |