diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-04 19:41:05 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-19 22:10:29 -0400 |
commit | 2b3a302a09735276e13421db56c20045a48eb06d (patch) | |
tree | 77af4f2f378d92d7b61727a38501feed3365e57f /drivers/base/bus.c | |
parent | 2424b5dd062cbe3e0578ae7b11a1b360ad22f451 (diff) |
driver core: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base/bus.c')
-rw-r--r-- | drivers/base/bus.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 450942acca1a..be1cc5143354 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c | |||
@@ -79,7 +79,7 @@ static void driver_release(struct kobject *kobj) | |||
79 | { | 79 | { |
80 | struct driver_private *drv_priv = to_driver(kobj); | 80 | struct driver_private *drv_priv = to_driver(kobj); |
81 | 81 | ||
82 | pr_debug("driver: '%s': %s\n", kobject_name(kobj), __FUNCTION__); | 82 | pr_debug("driver: '%s': %s\n", kobject_name(kobj), __func__); |
83 | kfree(drv_priv); | 83 | kfree(drv_priv); |
84 | } | 84 | } |
85 | 85 | ||
@@ -677,19 +677,19 @@ int bus_add_driver(struct device_driver *drv) | |||
677 | error = driver_create_file(drv, &driver_attr_uevent); | 677 | error = driver_create_file(drv, &driver_attr_uevent); |
678 | if (error) { | 678 | if (error) { |
679 | printk(KERN_ERR "%s: uevent attr (%s) failed\n", | 679 | printk(KERN_ERR "%s: uevent attr (%s) failed\n", |
680 | __FUNCTION__, drv->name); | 680 | __func__, drv->name); |
681 | } | 681 | } |
682 | error = driver_add_attrs(bus, drv); | 682 | error = driver_add_attrs(bus, drv); |
683 | if (error) { | 683 | if (error) { |
684 | /* How the hell do we get out of this pickle? Give up */ | 684 | /* How the hell do we get out of this pickle? Give up */ |
685 | printk(KERN_ERR "%s: driver_add_attrs(%s) failed\n", | 685 | printk(KERN_ERR "%s: driver_add_attrs(%s) failed\n", |
686 | __FUNCTION__, drv->name); | 686 | __func__, drv->name); |
687 | } | 687 | } |
688 | error = add_bind_files(drv); | 688 | error = add_bind_files(drv); |
689 | if (error) { | 689 | if (error) { |
690 | /* Ditto */ | 690 | /* Ditto */ |
691 | printk(KERN_ERR "%s: add_bind_files(%s) failed\n", | 691 | printk(KERN_ERR "%s: add_bind_files(%s) failed\n", |
692 | __FUNCTION__, drv->name); | 692 | __func__, drv->name); |
693 | } | 693 | } |
694 | 694 | ||
695 | kobject_uevent(&priv->kobj, KOBJ_ADD); | 695 | kobject_uevent(&priv->kobj, KOBJ_ADD); |