diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-05 21:24:54 -0500 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-04-18 11:55:30 -0400 |
commit | b1ce1fd778997b3313599a2561bcbd42a34bfb56 (patch) | |
tree | b0d2cded8d66b810e2da31ed49a1479d812508a7 /drivers/ieee1394/highlevel.c | |
parent | b25d166616ea30adedee70d99c40ba82d126d7cb (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/highlevel.c')
-rw-r--r-- | drivers/ieee1394/highlevel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c index b6425469b6ee..fa2bfec0fca2 100644 --- a/drivers/ieee1394/highlevel.c +++ b/drivers/ieee1394/highlevel.c | |||
@@ -339,7 +339,7 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl, | |||
339 | if ((alignment & 3) || (alignment > 0x800000000000ULL) || | 339 | if ((alignment & 3) || (alignment > 0x800000000000ULL) || |
340 | (hweight64(alignment) != 1)) { | 340 | (hweight64(alignment) != 1)) { |
341 | HPSB_ERR("%s called with invalid alignment: 0x%048llx", | 341 | HPSB_ERR("%s called with invalid alignment: 0x%048llx", |
342 | __FUNCTION__, (unsigned long long)alignment); | 342 | __func__, (unsigned long long)alignment); |
343 | return retval; | 343 | return retval; |
344 | } | 344 | } |
345 | 345 | ||
@@ -354,7 +354,7 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl, | |||
354 | if (((start|end) & ~align_mask) || (start >= end) || | 354 | if (((start|end) & ~align_mask) || (start >= end) || |
355 | (end > CSR1212_ALL_SPACE_END)) { | 355 | (end > CSR1212_ALL_SPACE_END)) { |
356 | HPSB_ERR("%s called with invalid addresses " | 356 | HPSB_ERR("%s called with invalid addresses " |
357 | "(start = %012Lx end = %012Lx)", __FUNCTION__, | 357 | "(start = %012Lx end = %012Lx)", __func__, |
358 | (unsigned long long)start,(unsigned long long)end); | 358 | (unsigned long long)start,(unsigned long long)end); |
359 | return retval; | 359 | return retval; |
360 | } | 360 | } |
@@ -422,7 +422,7 @@ int hpsb_register_addrspace(struct hpsb_highlevel *hl, struct hpsb_host *host, | |||
422 | 422 | ||
423 | if (((start|end) & 3) || (start >= end) || | 423 | if (((start|end) & 3) || (start >= end) || |
424 | (end > CSR1212_ALL_SPACE_END)) { | 424 | (end > CSR1212_ALL_SPACE_END)) { |
425 | HPSB_ERR("%s called with invalid addresses", __FUNCTION__); | 425 | HPSB_ERR("%s called with invalid addresses", __func__); |
426 | return 0; | 426 | return 0; |
427 | } | 427 | } |
428 | 428 | ||