IDE: Replace __FUNCTION__ with __func__
PATCH 2/3 IDE: Replace __FUNCTION__ with __func__
Applies on top of the previous patch.
Signed-off-by Paolo Ciarrocchi <[email protected]>
--- drivers/ide/ide-cd.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
drivers/ide/ide-cd.c +7 -7
@@ -650,7 +650,7 @@ int ide_cd_check_ireason(ide_drive_t *drive, int len, int ireason, int rw)/* Whoops... */ printk (KERN_ERR "%s: %s: wrong transfer direction!\n" , - drive->name, __FUNCTION__); + drive->name, __func__); xf = rw ? hwif->atapi_output_bytes : hwif->atapi_input_bytes;ide_cd_pad_transfer (drive, xf, len);
@@ -663,7 +663,7 @@ int ide_cd_check_ireason(ide_drive_t *drive, int len, int ireason, int rw) }else {/* Drive wants a command packet, or invalid ireason... */ printk (KERN_ERR "%s: %s: bad interrupt reason 0x%02x\n" , - drive->name, __FUNCTION__, ireason); + drive->name, __func__, ireason); }cdrom_end_request (drive,0 );
@@ -682,7 +682,7 @@ static int ide_cd_check_transfer_size(ide_drive_t *drive, int len)return 0 ;printk (KERN_ERR "%s: %s: Bad transfer size %d\n" , - drive->name, __FUNCTION__, len); + drive->name, __func__, len);if (cd->cd_flags &IDE_CD_FLAG_LIMIT_NFRAMES ) printk(KERN_ERR " This drive is not supported by "
@@ -727,7 +727,7 @@ static ide_startstop_t cdrom_start_rw_cont(ide_drive_t *drive)if (rq->current_nr_sectors !=bio_cur_sectors (rq->bio)) {printk (KERN_ERR "%s: %s: buffer botch (%u)\n" , - drive->name, __FUNCTION__, + drive->name, __func__, rq->current_nr_sectors);cdrom_end_request (drive,0 );return ide_stopped;
@@ -961,7 +961,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)if (rq->current_nr_sectors >0 ) {printk (KERN_ERR "%s: %s: data underrun " "(%d blocks)\n" , - drive->name, __FUNCTION__, + drive->name, __func__, rq->current_nr_sectors);if (!write) rq->cmd_flags |=REQ_FAILED ;
@@ -1018,7 +1018,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)printk (KERN_ERR "%s: %s: The drive " "appears confused (ireason = 0x%02x). " "Trying to recover by ending request.\n" , - drive->name, __FUNCTION__, ireason); + drive->name, __func__, ireason); goto end_request; }
@@ -1936,7 +1936,7 @@ static void ide_cd_release(struct kref *kref)kfree (info->toc);if (devinfo->handle == drive &&unregister_cdrom (devinfo))printk (KERN_ERR "%s: %s failed to unregister device from the cdrom " -"driver.\n" , __FUNCTION__, drive->name); +"driver.\n" , __func__, drive->name); drive->dsc_overlap =0 ; drive->driver_data =NULL ;blk_queue_prep_rq (drive->queue,NULL );
Signature · 1 line
1.5.4.2.316.gf7a7
drivers/ide/ide-cd.c static void ide_cd_release(struct kref *kref) · line 1939
Quoted 2 lines · Paolo Ciarrocchi
drivers/ide/ide-cd.c +1
-1- "driver.\n", __FUNCTION__, drive->name); + "driver.\n", __func__, drive->name);
Is there consensus on this style conversion?
Right now, there's 629 uses of __FUNCTION__ and 439 uses of __func__.
Quoted 5 lines · Joe Perches
drivers/ide/ide-cd.c static void ide_cd_release(struct kref *kref) · line 1939
Quoted 2 lines · Paolo Ciarrocchi
drivers/ide/ide-cd.c +1
-1- "driver.\n", __FUNCTION__, drive->name); + "driver.\n", __func__, drive->name);Is there consensus on this style conversion?
I did that in a separate patch because i'm not sure about that.
Quoted 1 line
Right now, there's 629 uses of
__FUNCTION__and 439 uses of__func__.
Checkpatch.pl indicate the conversion as a janitorial task.
Ciao,
--
Paolo
http://paolo.ciarrocchi.googlepages.com/