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>

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)
 
         /* Error? */
         if (stat & ERR_STAT)
-                return task_error(drive, rq, __FUNCTION__, stat);
+                return task_error(drive, rq, __func__, stat);
 
         /* Didn't want any data? Odd. */
         if (!(stat & DRQ_STAT))
@@ -467,7 +467,7 @@ static ide_startstop_t task_in_intr(ide_drive_t *drive)
         if (!hwif->nleft) {
                 stat = wait_drive_not_busy(drive);
                 if (!OK_STAT(stat, 0, BAD_STAT))
-                        return task_error(drive, rq, __FUNCTION__, stat);
+                        return task_error(drive, rq, __func__, stat);
                 task_end_request(drive, rq, stat);
                 return ide_stopped;
         }
@@ -488,11 +488,11 @@ static ide_startstop_t task_out_intr (ide_drive_t *drive)
         u8 stat = ide_read_status(drive);
 
         if (!OK_STAT(stat, DRIVE_READY, drive->bad_wstat))
-                return task_error(drive, rq, __FUNCTION__, stat);
+                return task_error(drive, rq, __func__, stat);
 
         /* Deal with unexpected ATA data phase. */
         if (((stat & DRQ_STAT) == 0) ^ !hwif->nleft)
-                return task_error(drive, rq, __FUNCTION__, stat);
+                return task_error(drive, rq, __func__, stat);
 
         if (!hwif->nleft) {
                 task_end_request(drive, rq, stat);
@@ -675,7 +675,7 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
                                 /* (hs): give up if multcount is not set */
                                 printk(KERN_ERR "%s: %s Multimode Write " \
                                         "multcount is not set\n",
-                                        drive->name, __FUNCTION__);
+                                        drive->name, __func__);
                                 err = -EPERM;
                                 goto abort;
                         }
@@ -692,7 +692,7 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
                                 /* (hs): give up if multcount is not set */
                                 printk(KERN_ERR "%s: %s Multimode Read failure " \
                                         "multcount is not set\n",
-                                        drive->name, __FUNCTION__);
+                                        drive->name, __func__);
                                 err = -EPERM;
                                 goto abort;
                         }