aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394/sbp2.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-03-05 21:24:54 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2008-04-18 11:55:30 -0400
commitb1ce1fd778997b3313599a2561bcbd42a34bfb56 (patch)
treeb0d2cded8d66b810e2da31ed49a1479d812508a7 /drivers/ieee1394/sbp2.c
parentb25d166616ea30adedee70d99c40ba82d126d7cb (diff)
ieee1394: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394/sbp2.c')
-rw-r--r--drivers/ieee1394/sbp2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 5f713a01f044..16b9d0ad154e 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -615,7 +615,7 @@ static struct sbp2_command_info *sbp2util_allocate_command_orb(
615 cmd->Current_SCpnt = Current_SCpnt; 615 cmd->Current_SCpnt = Current_SCpnt;
616 list_add_tail(&cmd->list, &lu->cmd_orb_inuse); 616 list_add_tail(&cmd->list, &lu->cmd_orb_inuse);
617 } else 617 } else
618 SBP2_ERR("%s: no orbs available", __FUNCTION__); 618 SBP2_ERR("%s: no orbs available", __func__);
619 spin_unlock_irqrestore(&lu->cmd_orb_lock, flags); 619 spin_unlock_irqrestore(&lu->cmd_orb_lock, flags);
620 return cmd; 620 return cmd;
621} 621}
@@ -1294,7 +1294,7 @@ static int sbp2_set_busy_timeout(struct sbp2_lu *lu)
1294 1294
1295 data = cpu_to_be32(SBP2_BUSY_TIMEOUT_VALUE); 1295 data = cpu_to_be32(SBP2_BUSY_TIMEOUT_VALUE);
1296 if (hpsb_node_write(lu->ne, SBP2_BUSY_TIMEOUT_ADDRESS, &data, 4)) 1296 if (hpsb_node_write(lu->ne, SBP2_BUSY_TIMEOUT_ADDRESS, &data, 4))
1297 SBP2_ERR("%s error", __FUNCTION__); 1297 SBP2_ERR("%s error", __func__);
1298 return 0; 1298 return 0;
1299} 1299}
1300 1300