aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-taskfile.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-26 16:25:20 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-26 16:25:20 -0400
commiteb63963a55f039f049d0dd1121f91f332af6ecc9 (patch)
tree42de9fdf101a1e45a60d43253057bc7435aef60d /drivers/ide/ide-taskfile.c
parentc4b22f816b8ee316cff06df3880f8341e1251211 (diff)
ide: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ [bart: fix checkpatch.pl errors in ide-lib.c and ppc/mpc8xx.c while at it] Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-taskfile.c')
-rw-r--r--drivers/ide/ide-taskfile.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 155cc904f4eb..fac6835273a8 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -455,7 +455,7 @@ static ide_startstop_t task_in_intr(ide_drive_t *drive)
455 455
456 /* Error? */ 456 /* Error? */
457 if (stat & ERR_STAT) 457 if (stat & ERR_STAT)
458 return task_error(drive, rq, __FUNCTION__, stat); 458 return task_error(drive, rq, __func__, stat);
459 459
460 /* Didn't want any data? Odd. */ 460 /* Didn't want any data? Odd. */
461 if (!(stat & DRQ_STAT)) 461 if (!(stat & DRQ_STAT))
@@ -467,7 +467,7 @@ static ide_startstop_t task_in_intr(ide_drive_t *drive)
467 if (!hwif->nleft) { 467 if (!hwif->nleft) {
468 stat = wait_drive_not_busy(drive); 468 stat = wait_drive_not_busy(drive);
469 if (!OK_STAT(stat, 0, BAD_STAT)) 469 if (!OK_STAT(stat, 0, BAD_STAT))
470 return task_error(drive, rq, __FUNCTION__, stat); 470 return task_error(drive, rq, __func__, stat);
471 task_end_request(drive, rq, stat); 471 task_end_request(drive, rq, stat);
472 return ide_stopped; 472 return ide_stopped;
473 } 473 }
@@ -488,11 +488,11 @@ static ide_startstop_t task_out_intr (ide_drive_t *drive)
488 u8 stat = ide_read_status(drive); 488 u8 stat = ide_read_status(drive);
489 489
490 if (!OK_STAT(stat, DRIVE_READY, drive->bad_wstat)) 490 if (!OK_STAT(stat, DRIVE_READY, drive->bad_wstat))
491 return task_error(drive, rq, __FUNCTION__, stat); 491 return task_error(drive, rq, __func__, stat);
492 492
493 /* Deal with unexpected ATA data phase. */ 493 /* Deal with unexpected ATA data phase. */
494 if (((stat & DRQ_STAT) == 0) ^ !hwif->nleft) 494 if (((stat & DRQ_STAT) == 0) ^ !hwif->nleft)
495 return task_error(drive, rq, __FUNCTION__, stat); 495 return task_error(drive, rq, __func__, stat);
496 496
497 if (!hwif->nleft) { 497 if (!hwif->nleft) {
498 task_end_request(drive, rq, stat); 498 task_end_request(drive, rq, stat);
@@ -675,7 +675,7 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
675 /* (hs): give up if multcount is not set */ 675 /* (hs): give up if multcount is not set */
676 printk(KERN_ERR "%s: %s Multimode Write " \ 676 printk(KERN_ERR "%s: %s Multimode Write " \
677 "multcount is not set\n", 677 "multcount is not set\n",
678 drive->name, __FUNCTION__); 678 drive->name, __func__);
679 err = -EPERM; 679 err = -EPERM;
680 goto abort; 680 goto abort;
681 } 681 }
@@ -692,7 +692,7 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
692 /* (hs): give up if multcount is not set */ 692 /* (hs): give up if multcount is not set */
693 printk(KERN_ERR "%s: %s Multimode Read failure " \ 693 printk(KERN_ERR "%s: %s Multimode Read failure " \
694 "multcount is not set\n", 694 "multcount is not set\n",
695 drive->name, __FUNCTION__); 695 drive->name, __func__);
696 err = -EPERM; 696 err = -EPERM;
697 goto abort; 697 goto abort;
698 } 698 }