Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit b687d2a8f8d46921ac5e80bf77967688afce68e2

Authored by Harvey Harrison
Committed by Linus Torvalds
1 parent 31a1629426
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 5 changed files with 9 additions and 9 deletions Side-by-side Diff

drivers/spi/omap_uwire.c
Diff comments   View file @ b687d2a
... ... @@ -151,7 +151,7 @@
151 151 if (time_after(jiffies, max_jiffies)) {
152 152 printk(KERN_ERR "%s: timeout. reg=%#06x "
153 153 "mask=%#06x val=%#06x\n",
154   - __FUNCTION__, w, mask, val);
  154 + __func__, w, mask, val);
155 155 return -1;
156 156 }
157 157 c++;
... ... @@ -437,7 +437,7 @@
437 437 }
438 438 omap_uwire_configure_mode(spi->chip_select, flags);
439 439 pr_debug("%s: uwire flags %02x, armxor %lu KHz, SCK %lu KHz\n",
440   - __FUNCTION__, flags,
  440 + __func__, flags,
441 441 clk_get_rate(uwire->ck) / 1000,
442 442 rate / 1000);
443 443 status = 0;
drivers/spi/spi_bitbang.c
Diff comments   View file @ b687d2a
... ... @@ -214,7 +214,7 @@
214 214 return retval;
215 215  
216 216 dev_dbg(&spi->dev, "%s, mode %d, %u bits/w, %u nsec/bit\n",
217   - __FUNCTION__, spi->mode & (SPI_CPOL | SPI_CPHA),
  217 + __func__, spi->mode & (SPI_CPOL | SPI_CPHA),
218 218 spi->bits_per_word, 2 * cs->nsecs);
219 219  
220 220 /* NOTE we _need_ to call chipselect() early, ideally with adapter
drivers/spi/spi_mpc83xx.c
Diff comments   View file @ b687d2a
... ... @@ -310,7 +310,7 @@
310 310 return retval;
311 311  
312 312 dev_dbg(&spi->dev, "%s, mode %d, %u bits/w, %u nsec\n",
313   - __FUNCTION__, spi->mode & (SPI_CPOL | SPI_CPHA),
  313 + __func__, spi->mode & (SPI_CPOL | SPI_CPHA),
314 314 spi->bits_per_word, 2 * mpc83xx_spi->nsecs);
315 315  
316 316 /* NOTE we _need_ to call chipselect() early, ideally with adapter
drivers/spi/spi_s3c24xx.c
Diff comments   View file @ b687d2a
... ... @@ -169,7 +169,7 @@
169 169 }
170 170  
171 171 dev_dbg(&spi->dev, "%s: mode %d, %u bpw, %d hz\n",
172   - __FUNCTION__, spi->mode, spi->bits_per_word,
  172 + __func__, spi->mode, spi->bits_per_word,
173 173 spi->max_speed_hz);
174 174  
175 175 return 0;
drivers/spi/xilinx_spi.c
Diff comments   View file @ b687d2a
... ... @@ -151,13 +151,13 @@
151 151 hz = (t) ? t->speed_hz : spi->max_speed_hz;
152 152 if (bits_per_word != 8) {
153 153 dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
154   - __FUNCTION__, bits_per_word);
  154 + __func__, bits_per_word);
155 155 return -EINVAL;
156 156 }
157 157  
158 158 if (hz && xspi->speed_hz > hz) {
159 159 dev_err(&spi->dev, "%s, unsupported clock rate %uHz\n",
160   - __FUNCTION__, hz);
  160 + __func__, hz);
161 161 return -EINVAL;
162 162 }
163 163  
... ... @@ -181,7 +181,7 @@
181 181  
182 182 if (spi->mode & ~MODEBITS) {
183 183 dev_err(&spi->dev, "%s, unsupported mode bits %x\n",
184   - __FUNCTION__, spi->mode & ~MODEBITS);
  184 + __func__, spi->mode & ~MODEBITS);
185 185 return -EINVAL;
186 186 }
187 187  
... ... @@ -190,7 +190,7 @@
190 190 return retval;
191 191  
192 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 195 return 0;
196 196 }