aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394/pcilynx.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/pcilynx.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/pcilynx.c')
-rw-r--r--drivers/ieee1394/pcilynx.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c
index 8af01ab30cc9..9c35e0d498cb 100644
--- a/drivers/ieee1394/pcilynx.c
+++ b/drivers/ieee1394/pcilynx.c
@@ -226,7 +226,7 @@ static int get_phy_reg(struct ti_lynx *lynx, int addr)
226 if (addr > 15) { 226 if (addr > 15) {
227 PRINT(KERN_ERR, lynx->id, 227 PRINT(KERN_ERR, lynx->id,
228 "%s: PHY register address %d out of range", 228 "%s: PHY register address %d out of range",
229 __FUNCTION__, addr); 229 __func__, addr);
230 return -1; 230 return -1;
231 } 231 }
232 232
@@ -238,7 +238,7 @@ static int get_phy_reg(struct ti_lynx *lynx, int addr)
238 238
239 if (i > 10000) { 239 if (i > 10000) {
240 PRINT(KERN_ERR, lynx->id, "%s: runaway loop, aborting", 240 PRINT(KERN_ERR, lynx->id, "%s: runaway loop, aborting",
241 __FUNCTION__); 241 __func__);
242 retval = -1; 242 retval = -1;
243 break; 243 break;
244 } 244 }
@@ -261,13 +261,13 @@ static int set_phy_reg(struct ti_lynx *lynx, int addr, int val)
261 261
262 if (addr > 15) { 262 if (addr > 15) {
263 PRINT(KERN_ERR, lynx->id, 263 PRINT(KERN_ERR, lynx->id,
264 "%s: PHY register address %d out of range", __FUNCTION__, addr); 264 "%s: PHY register address %d out of range", __func__, addr);
265 return -1; 265 return -1;
266 } 266 }
267 267
268 if (val > 0xff) { 268 if (val > 0xff) {
269 PRINT(KERN_ERR, lynx->id, 269 PRINT(KERN_ERR, lynx->id,
270 "%s: PHY register value %d out of range", __FUNCTION__, val); 270 "%s: PHY register value %d out of range", __func__, val);
271 return -1; 271 return -1;
272 } 272 }
273 273
@@ -287,7 +287,7 @@ static int sel_phy_reg_page(struct ti_lynx *lynx, int page)
287 287
288 if (page > 7) { 288 if (page > 7) {
289 PRINT(KERN_ERR, lynx->id, 289 PRINT(KERN_ERR, lynx->id,
290 "%s: PHY page %d out of range", __FUNCTION__, page); 290 "%s: PHY page %d out of range", __func__, page);
291 return -1; 291 return -1;
292 } 292 }
293 293
@@ -309,7 +309,7 @@ static int sel_phy_reg_port(struct ti_lynx *lynx, int port)
309 309
310 if (port > 15) { 310 if (port > 15) {
311 PRINT(KERN_ERR, lynx->id, 311 PRINT(KERN_ERR, lynx->id,
312 "%s: PHY port %d out of range", __FUNCTION__, port); 312 "%s: PHY port %d out of range", __func__, port);
313 return -1; 313 return -1;
314 } 314 }
315 315