aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/xilinx_spi.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-28 05:14:19 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:31 -0400
commitb687d2a8f8d46921ac5e80bf77967688afce68e2 (patch)
treec8f75152f6f20fd12e8128c7396b1d600691e063 /drivers/spi/xilinx_spi.c
parent31a16294261a897ab7f59a5c26e4935a851fd410 (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/xilinx_spi.c')
-rw-r--r--drivers/spi/xilinx_spi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index cf6aef34fe25..113a0468ffcb 100644
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -151,13 +151,13 @@ static int xilinx_spi_setup_transfer(struct spi_device *spi,
151 hz = (t) ? t->speed_hz : spi->max_speed_hz; 151 hz = (t) ? t->speed_hz : spi->max_speed_hz;
152 if (bits_per_word != 8) { 152 if (bits_per_word != 8) {
153 dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n", 153 dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
154 __FUNCTION__, bits_per_word); 154 __func__, bits_per_word);
155 return -EINVAL; 155 return -EINVAL;
156 } 156 }
157 157
158 if (hz && xspi->speed_hz > hz) { 158 if (hz && xspi->speed_hz > hz) {
159 dev_err(&spi->dev, "%s, unsupported clock rate %uHz\n", 159 dev_err(&spi->dev, "%s, unsupported clock rate %uHz\n",
160 __FUNCTION__, hz); 160 __func__, hz);
161 return -EINVAL; 161 return -EINVAL;
162 } 162 }
163 163
@@ -181,7 +181,7 @@ static int xilinx_spi_setup(struct spi_device *spi)
181 181
182 if (spi->mode & ~MODEBITS) { 182 if (spi->mode & ~MODEBITS) {
183 dev_err(&spi->dev, "%s, unsupported mode bits %x\n", 183 dev_err(&spi->dev, "%s, unsupported mode bits %x\n",
184 __FUNCTION__, spi->mode & ~MODEBITS); 184 __func__, spi->mode & ~MODEBITS);
185 return -EINVAL; 185 return -EINVAL;
186 } 186 }
187 187
@@ -190,7 +190,7 @@ static int xilinx_spi_setup(struct spi_device *spi)
190 return retval; 190 return retval;
191 191
192 dev_dbg(&spi->dev, "%s, mode %d, %u bits/w, %u nsec/bit\n", 192 dev_dbg(&spi->dev, "%s, mode %d, %u bits/w, %u nsec/bit\n",
193 __FUNCTION__, spi->mode & MODEBITS, spi->bits_per_word, 0); 193 __func__, spi->mode & MODEBITS, spi->bits_per_word, 0);
194 194
195 return 0; 195 return 0;
196} 196}