diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-28 05:14:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:31 -0400 |
commit | b687d2a8f8d46921ac5e80bf77967688afce68e2 (patch) | |
tree | c8f75152f6f20fd12e8128c7396b1d600691e063 /drivers/spi/omap_uwire.c | |
parent | 31a16294261a897ab7f59a5c26e4935a851fd410 (diff) |
spi: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi/omap_uwire.c')
-rw-r--r-- | drivers/spi/omap_uwire.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c index 5f00bd6500ef..d9ae111c27ae 100644 --- a/drivers/spi/omap_uwire.c +++ b/drivers/spi/omap_uwire.c | |||
@@ -151,7 +151,7 @@ static int wait_uwire_csr_flag(u16 mask, u16 val, int might_not_catch) | |||
151 | if (time_after(jiffies, max_jiffies)) { | 151 | if (time_after(jiffies, max_jiffies)) { |
152 | printk(KERN_ERR "%s: timeout. reg=%#06x " | 152 | printk(KERN_ERR "%s: timeout. reg=%#06x " |
153 | "mask=%#06x val=%#06x\n", | 153 | "mask=%#06x val=%#06x\n", |
154 | __FUNCTION__, w, mask, val); | 154 | __func__, w, mask, val); |
155 | return -1; | 155 | return -1; |
156 | } | 156 | } |
157 | c++; | 157 | c++; |
@@ -437,7 +437,7 @@ static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t) | |||
437 | } | 437 | } |
438 | omap_uwire_configure_mode(spi->chip_select, flags); | 438 | omap_uwire_configure_mode(spi->chip_select, flags); |
439 | pr_debug("%s: uwire flags %02x, armxor %lu KHz, SCK %lu KHz\n", | 439 | pr_debug("%s: uwire flags %02x, armxor %lu KHz, SCK %lu KHz\n", |
440 | __FUNCTION__, flags, | 440 | __func__, flags, |
441 | clk_get_rate(uwire->ck) / 1000, | 441 | clk_get_rate(uwire->ck) / 1000, |
442 | rate / 1000); | 442 | rate / 1000); |
443 | status = 0; | 443 | status = 0; |