diff options
author | Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> | 2008-04-26 11:36:42 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 11:36:42 -0400 |
commit | 177773ed87586214c423ef1204b42d35f0ec8f81 (patch) | |
tree | a0fcf47f02f24be2c7f0f17340a2e028a5e68a68 | |
parent | 9ce70fb2b5ab9feb24afd1ea971bfa86bbc5625c (diff) |
ide-cd: Replace __FUNCTION__ with __func__
[bart: md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r-- | drivers/ide/ide-cd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 49abbb5f3427..3a8e8eb61e29 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -651,7 +651,7 @@ static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq, | |||
651 | 651 | ||
652 | /* Whoops... */ | 652 | /* Whoops... */ |
653 | printk(KERN_ERR "%s: %s: wrong transfer direction!\n", | 653 | printk(KERN_ERR "%s: %s: wrong transfer direction!\n", |
654 | drive->name, __FUNCTION__); | 654 | drive->name, __func__); |
655 | 655 | ||
656 | xf = rw ? hwif->atapi_output_bytes : hwif->atapi_input_bytes; | 656 | xf = rw ? hwif->atapi_output_bytes : hwif->atapi_input_bytes; |
657 | ide_cd_pad_transfer(drive, xf, len); | 657 | ide_cd_pad_transfer(drive, xf, len); |
@@ -664,7 +664,7 @@ static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq, | |||
664 | } else { | 664 | } else { |
665 | /* Drive wants a command packet, or invalid ireason... */ | 665 | /* Drive wants a command packet, or invalid ireason... */ |
666 | printk(KERN_ERR "%s: %s: bad interrupt reason 0x%02x\n", | 666 | printk(KERN_ERR "%s: %s: bad interrupt reason 0x%02x\n", |
667 | drive->name, __FUNCTION__, ireason); | 667 | drive->name, __func__, ireason); |
668 | } | 668 | } |
669 | 669 | ||
670 | if (rq->cmd_type == REQ_TYPE_ATA_PC) | 670 | if (rq->cmd_type == REQ_TYPE_ATA_PC) |
@@ -686,7 +686,7 @@ static int ide_cd_check_transfer_size(ide_drive_t *drive, int len) | |||
686 | return 0; | 686 | return 0; |
687 | 687 | ||
688 | printk(KERN_ERR "%s: %s: Bad transfer size %d\n", | 688 | printk(KERN_ERR "%s: %s: Bad transfer size %d\n", |
689 | drive->name, __FUNCTION__, len); | 689 | drive->name, __func__, len); |
690 | 690 | ||
691 | if (cd->cd_flags & IDE_CD_FLAG_LIMIT_NFRAMES) | 691 | if (cd->cd_flags & IDE_CD_FLAG_LIMIT_NFRAMES) |
692 | printk(KERN_ERR " This drive is not supported by " | 692 | printk(KERN_ERR " This drive is not supported by " |
@@ -731,7 +731,7 @@ static ide_startstop_t cdrom_start_rw_cont(ide_drive_t *drive) | |||
731 | if (rq->current_nr_sectors != | 731 | if (rq->current_nr_sectors != |
732 | bio_cur_sectors(rq->bio)) { | 732 | bio_cur_sectors(rq->bio)) { |
733 | printk(KERN_ERR "%s: %s: buffer botch (%u)\n", | 733 | printk(KERN_ERR "%s: %s: buffer botch (%u)\n", |
734 | drive->name, __FUNCTION__, | 734 | drive->name, __func__, |
735 | rq->current_nr_sectors); | 735 | rq->current_nr_sectors); |
736 | cdrom_end_request(drive, 0); | 736 | cdrom_end_request(drive, 0); |
737 | return ide_stopped; | 737 | return ide_stopped; |
@@ -965,7 +965,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) | |||
965 | if (rq->current_nr_sectors > 0) { | 965 | if (rq->current_nr_sectors > 0) { |
966 | printk(KERN_ERR "%s: %s: data underrun " | 966 | printk(KERN_ERR "%s: %s: data underrun " |
967 | "(%d blocks)\n", | 967 | "(%d blocks)\n", |
968 | drive->name, __FUNCTION__, | 968 | drive->name, __func__, |
969 | rq->current_nr_sectors); | 969 | rq->current_nr_sectors); |
970 | if (!write) | 970 | if (!write) |
971 | rq->cmd_flags |= REQ_FAILED; | 971 | rq->cmd_flags |= REQ_FAILED; |