diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-05 23:47:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-05 23:47:47 -0500 |
commit | 0dc47877a3de00ceadea0005189656ae8dc52669 (patch) | |
tree | 7440a87385fe318cb42f0ae161be195f5e967d82 /net/bridge | |
parent | 6387c4bed539539b05fa773cf2ff26529dc3074c (diff) |
net: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_sysfs_br.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c index 9cf0538d1717..27d6a511c8c1 100644 --- a/net/bridge/br_sysfs_br.c +++ b/net/bridge/br_sysfs_br.c | |||
@@ -415,21 +415,21 @@ int br_sysfs_addbr(struct net_device *dev) | |||
415 | err = sysfs_create_group(brobj, &bridge_group); | 415 | err = sysfs_create_group(brobj, &bridge_group); |
416 | if (err) { | 416 | if (err) { |
417 | pr_info("%s: can't create group %s/%s\n", | 417 | pr_info("%s: can't create group %s/%s\n", |
418 | __FUNCTION__, dev->name, bridge_group.name); | 418 | __func__, dev->name, bridge_group.name); |
419 | goto out1; | 419 | goto out1; |
420 | } | 420 | } |
421 | 421 | ||
422 | err = sysfs_create_bin_file(brobj, &bridge_forward); | 422 | err = sysfs_create_bin_file(brobj, &bridge_forward); |
423 | if (err) { | 423 | if (err) { |
424 | pr_info("%s: can't create attribute file %s/%s\n", | 424 | pr_info("%s: can't create attribute file %s/%s\n", |
425 | __FUNCTION__, dev->name, bridge_forward.attr.name); | 425 | __func__, dev->name, bridge_forward.attr.name); |
426 | goto out2; | 426 | goto out2; |
427 | } | 427 | } |
428 | 428 | ||
429 | br->ifobj = kobject_create_and_add(SYSFS_BRIDGE_PORT_SUBDIR, brobj); | 429 | br->ifobj = kobject_create_and_add(SYSFS_BRIDGE_PORT_SUBDIR, brobj); |
430 | if (!br->ifobj) { | 430 | if (!br->ifobj) { |
431 | pr_info("%s: can't add kobject (directory) %s/%s\n", | 431 | pr_info("%s: can't add kobject (directory) %s/%s\n", |
432 | __FUNCTION__, dev->name, SYSFS_BRIDGE_PORT_SUBDIR); | 432 | __func__, dev->name, SYSFS_BRIDGE_PORT_SUBDIR); |
433 | goto out3; | 433 | goto out3; |
434 | } | 434 | } |
435 | return 0; | 435 | return 0; |