diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-30 03:54:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:53 -0400 |
commit | 145980a0b07520f0f82cc40999acc92b349ea40c (patch) | |
tree | 48bc21442adcda4561b8f5356380cc168d059619 /drivers/parport | |
parent | bdf4bbaaee3d4b8f555658333cbce1affe9070fb (diff) |
drivers: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/parport')
-rw-r--r-- | drivers/parport/parport_gsc.c | 4 | ||||
-rw-r--r-- | drivers/parport/parport_pc.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c index 0e77ae2b71a0..e6a7e847ee80 100644 --- a/drivers/parport/parport_gsc.c +++ b/drivers/parport/parport_gsc.c | |||
@@ -365,11 +365,11 @@ static int __devinit parport_init_chip(struct parisc_device *dev) | |||
365 | if (boot_cpu_data.cpu_type > pcxt && !pdc_add_valid(port+4)) { | 365 | if (boot_cpu_data.cpu_type > pcxt && !pdc_add_valid(port+4)) { |
366 | 366 | ||
367 | /* Initialize bidirectional-mode (0x10) & data-tranfer-mode #1 (0x20) */ | 367 | /* Initialize bidirectional-mode (0x10) & data-tranfer-mode #1 (0x20) */ |
368 | printk("%s: initialize bidirectional-mode.\n", __FUNCTION__); | 368 | printk("%s: initialize bidirectional-mode.\n", __func__); |
369 | parport_writeb ( (0x10 + 0x20), port + 4); | 369 | parport_writeb ( (0x10 + 0x20), port + 4); |
370 | 370 | ||
371 | } else { | 371 | } else { |
372 | printk("%s: enhanced parport-modes not supported.\n", __FUNCTION__); | 372 | printk("%s: enhanced parport-modes not supported.\n", __func__); |
373 | } | 373 | } |
374 | 374 | ||
375 | p = parport_gsc_probe_port(port, 0, dev->irq, | 375 | p = parport_gsc_probe_port(port, 0, dev->irq, |
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index e71092e80288..e0c2a4584ec6 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c | |||
@@ -1415,7 +1415,7 @@ static void __devinit winbond_check(int io, int key) | |||
1415 | { | 1415 | { |
1416 | int devid,devrev,oldid,x_devid,x_devrev,x_oldid; | 1416 | int devid,devrev,oldid,x_devid,x_devrev,x_oldid; |
1417 | 1417 | ||
1418 | if (!request_region(io, 3, __FUNCTION__)) | 1418 | if (!request_region(io, 3, __func__)) |
1419 | return; | 1419 | return; |
1420 | 1420 | ||
1421 | /* First probe without key */ | 1421 | /* First probe without key */ |
@@ -1449,7 +1449,7 @@ static void __devinit winbond_check2(int io,int key) | |||
1449 | { | 1449 | { |
1450 | int devid,devrev,oldid,x_devid,x_devrev,x_oldid; | 1450 | int devid,devrev,oldid,x_devid,x_devrev,x_oldid; |
1451 | 1451 | ||
1452 | if (!request_region(io, 3, __FUNCTION__)) | 1452 | if (!request_region(io, 3, __func__)) |
1453 | return; | 1453 | return; |
1454 | 1454 | ||
1455 | /* First probe without the key */ | 1455 | /* First probe without the key */ |
@@ -1482,7 +1482,7 @@ static void __devinit smsc_check(int io, int key) | |||
1482 | { | 1482 | { |
1483 | int id,rev,oldid,oldrev,x_id,x_rev,x_oldid,x_oldrev; | 1483 | int id,rev,oldid,oldrev,x_id,x_rev,x_oldid,x_oldrev; |
1484 | 1484 | ||
1485 | if (!request_region(io, 3, __FUNCTION__)) | 1485 | if (!request_region(io, 3, __func__)) |
1486 | return; | 1486 | return; |
1487 | 1487 | ||
1488 | /* First probe without the key */ | 1488 | /* First probe without the key */ |
@@ -1547,7 +1547,7 @@ static void __devinit detect_and_report_it87(void) | |||
1547 | u8 r; | 1547 | u8 r; |
1548 | if (verbose_probing) | 1548 | if (verbose_probing) |
1549 | printk(KERN_DEBUG "IT8705 Super-IO detection, now testing port 2E ...\n"); | 1549 | printk(KERN_DEBUG "IT8705 Super-IO detection, now testing port 2E ...\n"); |
1550 | if (!request_region(0x2e, 1, __FUNCTION__)) | 1550 | if (!request_region(0x2e, 1, __func__)) |
1551 | return; | 1551 | return; |
1552 | outb(0x87, 0x2e); | 1552 | outb(0x87, 0x2e); |
1553 | outb(0x01, 0x2e); | 1553 | outb(0x01, 0x2e); |