IDE: ide-taskfile.c fix compilation warning and cleanup
PATCH 1/1 IDE: ide-taskfile.c fix compilation warning and cleanup
reverting f2bc316736e69e5 solves compilation warning :
CC drivers/ide/ide-taskfile.o
drivers/ide/ide-taskfile.c: In function ‘ide_pio_bytes’:
drivers/ide/ide-taskfile.c:229: warning: ‘flags’ may be used uninitialized in this function
Fix trivial style problems:
WARNING: Use #include <linux/uaccess.h> instead of <asm/uaccess.h>
WARNING: space prohibited between function name and open parenthesis '('
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
ERROR: do not use C99 // comments X 2
ERROR: trailing statements should be on next line
ERROR: trailing whitespace
ERROR: switch and case should be at the same indent
WARNING: line over 80 characters
total: 5 errors, 4 warnings
Also removed dead code
Also used pr_err() to avoid line breaks
--- drivers/ide/ide-taskfile.c | 121 +++++++++++++++++++++---------------------- 1 files changed, 59 insertions(+), 62 deletions(-)
drivers/ide/ide-taskfile.c +59 -62
@@ -19,8 +19,8 @@#include <linux/hdreg.h> #include <linux/ide.h> #include <linux/scatterlist.h> +#include <linux/uaccess.h> -#include <asm/uaccess.h> #include <asm/io.h> void ide_tf_readback (ide_drive_t *drive,struct ide_cmd *cmd)
@@ -53,7 +53,7 @@ void ide_tf_dump(const char *s, struct ide_cmd *cmd)#endif } -int taskfile_lib_get_identify (ide_drive_t *drive,u8 *buf) +int taskfile_lib_get_identify (ide_drive_t *drive,u8 *buf) {struct ide_cmd cmd;
@@ -86,7 +86,7 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd)if (orig_cmd->protocol ==ATA_PROT_PIO && (orig_cmd->tf_flags &IDE_TFLAG_MULTI_PIO ) && drive->mult_count ==0 ) { -printk (KERN_ERR "%s: multimode not set!\n" , drive->name); +pr_err ("%s: multimode not set!\n" , drive->name);return ide_stopped; }
@@ -215,7 +215,7 @@ static u8 wait_drive_not_busy(ide_drive_t *drive) }if (stat &ATA_BUSY ) -printk (KERN_ERR "%s: drive still BUSY!\n" , drive->name); +pr_err ("%s: drive still BUSY!\n" , drive->name);return stat; }
@@ -227,7 +227,9 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,struct scatterlist *sg = hwif->sg_table;struct scatterlist *cursg = cmd->cursg;struct page *page; +#ifdef CONFIG_HIGHMEM unsigned long flags; +#endif unsigned int offset;u8 *buf;
@@ -248,8 +250,9 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, page =nth_page (page, (offset >>PAGE_SHIFT )); offset %=PAGE_SIZE ; -if (PageHighMem (page)) -local_irq_save (flags); +#ifdef CONFIG_HIGHMEM +local_irq_save (flags); +#endif buf =kmap_atomic (page,KM_BIO_SRC_IRQ ) + offset;
@@ -269,8 +272,9 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,kunmap_atomic (buf,KM_BIO_SRC_IRQ ); -if (PageHighMem (page)) -local_irq_restore (flags); +#ifdef CONFIG_HIGHMEM +local_irq_restore (flags); +#endif len -= nr_bytes; }
@@ -399,8 +403,7 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,if (ide_wait_stat (&startstop, drive,ATA_DRQ , drive->bad_wstat,WAIT_DRQ )) { -printk (KERN_ERR "%s: no DRQ after issuing %sWRITE%s\n" , - drive->name, +pr_err ("%s: no DRQ after issuing %sWRITE%s\n" , drive->name, (cmd->tf_flags &IDE_TFLAG_MULTI_PIO ) ?"MULT" :"" , (drive->dev_flags &IDE_DFLAG_LBA48 ) ?"_EXT" :"" );return startstop;
@@ -446,7 +449,6 @@ int ide_raw_taskfile(ide_drive_t *drive, struct ide_cmd *cmd, u8 *buf,return error; } -EXPORT_SYMBOL (ide_raw_taskfile);int ide_no_data_taskfile (ide_drive_t *drive,struct ide_cmd *cmd)
@@ -472,10 +474,9 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)u16 nsect =0 ;char __user *buf = (char __user *)arg; -// printk("IDE Taskfile ...\n"); - req_task =kzalloc (tasksize,GFP_KERNEL ); -if (req_task ==NULL )return -ENOMEM ; +if (req_task ==NULL ) +return -ENOMEM ;if (copy_from_user (req_task, buf, tasksize)) {kfree (req_task);return -EFAULT ;
@@ -483,7 +484,7 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg) taskout = req_task->out_size; taskin = req_task->in_size; - +if (taskin >65536 || taskout >65536 ) { err = -EINVAL ; goto abort;
@@ -573,51 +574,49 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg) cmd.protocol =ATA_PROT_DMA ;switch (req_task->data_phase) { -case TASKFILE_MULTI_OUT : -if (!drive->mult_count) { -/* (hs): give up if multcount is not set */ -printk (KERN_ERR "%s: %s Multimode Write " \ -"multcount is not set\n" , - drive->name, __func__); - err = -EPERM ; - goto abort; - } - cmd.tf_flags |=IDE_TFLAG_MULTI_PIO ; -/* fall through */ -case TASKFILE_OUT : - cmd.protocol =ATA_PROT_PIO ; -/* fall through */ -case TASKFILE_OUT_DMAQ : -case TASKFILE_OUT_DMA : - cmd.tf_flags |=IDE_TFLAG_WRITE ; - nsect = taskout /SECTOR_SIZE ; - data_buf = outbuf; -break ; -case TASKFILE_MULTI_IN : -if (!drive->mult_count) { -/* (hs): give up if multcount is not set */ -printk (KERN_ERR "%s: %s Multimode Read failure " \ -"multcount is not set\n" , - drive->name, __func__); - err = -EPERM ; - goto abort; - } - cmd.tf_flags |=IDE_TFLAG_MULTI_PIO ; -/* fall through */ -case TASKFILE_IN : - cmd.protocol =ATA_PROT_PIO ; -/* fall through */ -case TASKFILE_IN_DMAQ : -case TASKFILE_IN_DMA : - nsect = taskin /SECTOR_SIZE ; - data_buf = inbuf; -break ; -case TASKFILE_NO_DATA : - cmd.protocol =ATA_PROT_NODATA ; -break ; -default : - err = -EFAULT ; +case TASKFILE_MULTI_OUT : +if (!drive->mult_count) { +/* (hs): give up if multcount is not set */ +pr_err ("%s: %s Multimode Write multcount is not set\n" , + drive->name, __func__); + err = -EPERM ; + goto abort; + } + cmd.tf_flags |=IDE_TFLAG_MULTI_PIO ; +/* fall through */ +case TASKFILE_OUT : + cmd.protocol =ATA_PROT_PIO ; +/* fall through */ +case TASKFILE_OUT_DMAQ : +case TASKFILE_OUT_DMA : + cmd.tf_flags |=IDE_TFLAG_WRITE ; + nsect = taskout /SECTOR_SIZE ; + data_buf = outbuf; +break ; +case TASKFILE_MULTI_IN : +if (!drive->mult_count) { +/* (hs): give up if multcount is not set */ +pr_err ("%s: %s Multimode Read multcount is not set\n" , + drive->name, __func__); + err = -EPERM ; goto abort; + } + cmd.tf_flags |=IDE_TFLAG_MULTI_PIO ; +/* fall through */ +case TASKFILE_IN : + cmd.protocol =ATA_PROT_PIO ; +/* fall through */ +case TASKFILE_IN_DMAQ : +case TASKFILE_IN_DMA : + nsect = taskin /SECTOR_SIZE ; + data_buf = inbuf; +break ; +case TASKFILE_NO_DATA : + cmd.protocol =ATA_PROT_NODATA ; +break ; +default : + err = -EFAULT ; + goto abort; }if (req_task->req_cmd ==IDE_DRIVE_TASK_NO_DATA )
@@ -626,7 +625,7 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg) nsect = (cmd.hob.nsect <<8 ) | cmd.tf.nsect;if (!nsect) { -printk (KERN_ERR "%s: in/out command without data\n" , +pr_err ("%s: in/out command without data\n" , drive->name); err = -EFAULT ; goto abort;
@@ -668,8 +667,6 @@ abort:kfree (outbuf);kfree (inbuf); -// printk("IDE Taskfile ioctl ended. rc = %i\n", err); - return err; }#endif
Signature · 1 line
1.6.0.6
From: Jaswinder Singh Rajput <[email protected]>
Date: Mon, 22 Jun 2009 11:39:33 +0530
drivers/ide/ide-taskfile.c void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, · line 232
Quoted 8 lines
}
drivers/ide/ide-taskfile.c +2
-0@@ -227,7 +227,9 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,struct scatterlist *sg = hwif->sg_table;struct scatterlist *cursg = cmd->cursg;struct page *page; +#ifdef CONFIG_HIGHMEM unsigned long flags; +#endif
Please use __maybe_unused, which is designed for this kind of situation.
Thank you.
Quoted 13 lines · On Monday 22 June 2009 08:09:33 Jaswinder Singh Rajput wrote:
drivers/ide/ide-taskfile.c +3
-2@@ -248,8 +250,9 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, page =nth_page (page, (offset >>PAGE_SHIFT )); offset %=PAGE_SIZE ; -if (PageHighMem (page)) -local_irq_save (flags); +#ifdef CONFIG_HIGHMEM +local_irq_save (flags); +#endif buf =kmap_atomic (page,KM_BIO_SRC_IRQ ) + offset;
drivers/ide/ide-taskfile.c void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, · line 277
Quoted 8 lines
drivers/ide/ide-taskfile.c +3
-2@@ -269,8 +272,9 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,kunmap_atomic (buf,KM_BIO_SRC_IRQ ); -if (PageHighMem (page)) -local_irq_restore (flags); +#ifdef CONFIG_HIGHMEM +local_irq_restore (flags); +#endif
This part is incorrect (adds a performance regression for low-mem pages w/ HIGHMEM=y) and seems to be accidental (nothing about it in the patch description).
Besides I would suggest splitting the patch on fix and cleanup parts.
Quoted 28 lines · Bartlomiej Zolnierkiewicz
Quoted 13 lines · On Monday 22 June 2009 08:09:33 Jaswinder Singh Rajput wrote:
(quoted diff) +3
-2@@ -248,8 +250,9 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, page = nth_page(page, (offset >> PAGE_SHIFT)); offset %= PAGE_SIZE; - if (PageHighMem(page)) - local_irq_save(flags); +#ifdef CONFIG_HIGHMEM + local_irq_save(flags); +#endif buf = kmap_atomic(page, KM_BIO_SRC_IRQ) + offset;Review void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, · line 277
Quoted 8 lines
(quoted diff) +3
-2@@ -269,8 +272,9 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, kunmap_atomic(buf, KM_BIO_SRC_IRQ); - if (PageHighMem(page)) - local_irq_restore(flags); +#ifdef CONFIG_HIGHMEM + local_irq_restore(flags); +#endifThis part is incorrect (adds a performance regression for low-mem pages w/ HIGHMEM=y) and seems to be accidental (nothing about it in the patch description).
Quoted 1 line
Besides I would suggest splitting the patch on fix and cleanup parts.
Here is the cleanup part:
[PATCH] IDE: ide-taskfile.c fix style problems
Fix trivial style problems:
WARNING: Use #include <linux/uaccess.h> instead of <asm/uaccess.h>
WARNING: space prohibited between function name and open parenthesis '('
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
ERROR: do not use C99 // comments X 2
ERROR: trailing statements should be on next line
ERROR: trailing whitespace
ERROR: switch and case should be at the same indent
WARNING: line over 80 characters
total: 5 errors, 4 warnings
Also removed dead code
Also used pr_err() to avoid line breaks
--- drivers/ide/ide-taskfile.c | 109 ++++++++++++++++++++----------------------- 1 files changed, 51 insertions(+), 58 deletions(-)
drivers/ide/ide-taskfile.c +51 -58
@@ -19,8 +19,8 @@#include <linux/hdreg.h> #include <linux/ide.h> #include <linux/scatterlist.h> +#include <linux/uaccess.h> -#include <asm/uaccess.h> #include <asm/io.h> void ide_tf_readback (ide_drive_t *drive,struct ide_cmd *cmd)
@@ -53,7 +53,7 @@ void ide_tf_dump(const char *s, struct ide_cmd *cmd)#endif } -int taskfile_lib_get_identify (ide_drive_t *drive,u8 *buf) +int taskfile_lib_get_identify (ide_drive_t *drive,u8 *buf) {struct ide_cmd cmd;
@@ -86,7 +86,7 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd)if (orig_cmd->protocol ==ATA_PROT_PIO && (orig_cmd->tf_flags &IDE_TFLAG_MULTI_PIO ) && drive->mult_count ==0 ) { -printk (KERN_ERR "%s: multimode not set!\n" , drive->name); +pr_err ("%s: multimode not set!\n" , drive->name);return ide_stopped; }
@@ -214,7 +214,7 @@ static u8 wait_drive_not_busy(ide_drive_t *drive) }if (stat &ATA_BUSY ) -printk (KERN_ERR "%s: drive still BUSY!\n" , drive->name); +pr_err ("%s: drive still BUSY!\n" , drive->name);return stat; }
@@ -398,8 +398,7 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,if (ide_wait_stat (&startstop, drive,ATA_DRQ , drive->bad_wstat,WAIT_DRQ )) { -printk (KERN_ERR "%s: no DRQ after issuing %sWRITE%s\n" , - drive->name, +pr_err ("%s: no DRQ after issuing %sWRITE%s\n" , drive->name, (cmd->tf_flags &IDE_TFLAG_MULTI_PIO ) ?"MULT" :"" , (drive->dev_flags &IDE_DFLAG_LBA48 ) ?"_EXT" :"" );return startstop;
@@ -449,7 +448,6 @@ put_req:blk_put_request (rq);return error; } -EXPORT_SYMBOL (ide_raw_taskfile);int ide_no_data_taskfile (ide_drive_t *drive,struct ide_cmd *cmd)
@@ -475,10 +473,9 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)u16 nsect =0 ;char __user *buf = (char __user *)arg; -// printk("IDE Taskfile ...\n"); - req_task =kzalloc (tasksize,GFP_KERNEL ); -if (req_task ==NULL )return -ENOMEM ; +if (req_task ==NULL ) +return -ENOMEM ;if (copy_from_user (req_task, buf, tasksize)) {kfree (req_task);return -EFAULT ;
@@ -486,7 +483,7 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg) taskout = req_task->out_size; taskin = req_task->in_size; - +if (taskin >65536 || taskout >65536 ) { err = -EINVAL ; goto abort;
@@ -576,51 +573,49 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg) cmd.protocol =ATA_PROT_DMA ;switch (req_task->data_phase) { -case TASKFILE_MULTI_OUT : -if (!drive->mult_count) { -/* (hs): give up if multcount is not set */ -printk (KERN_ERR "%s: %s Multimode Write " \ -"multcount is not set\n" , - drive->name, __func__); - err = -EPERM ; - goto abort; - } - cmd.tf_flags |=IDE_TFLAG_MULTI_PIO ; -/* fall through */ -case TASKFILE_OUT : - cmd.protocol =ATA_PROT_PIO ; -/* fall through */ -case TASKFILE_OUT_DMAQ : -case TASKFILE_OUT_DMA : - cmd.tf_flags |=IDE_TFLAG_WRITE ; - nsect = taskout /SECTOR_SIZE ; - data_buf = outbuf; -break ; -case TASKFILE_MULTI_IN : -if (!drive->mult_count) { -/* (hs): give up if multcount is not set */ -printk (KERN_ERR "%s: %s Multimode Read failure " \ -"multcount is not set\n" , - drive->name, __func__); - err = -EPERM ; - goto abort; - } - cmd.tf_flags |=IDE_TFLAG_MULTI_PIO ; -/* fall through */ -case TASKFILE_IN : - cmd.protocol =ATA_PROT_PIO ; -/* fall through */ -case TASKFILE_IN_DMAQ : -case TASKFILE_IN_DMA : - nsect = taskin /SECTOR_SIZE ; - data_buf = inbuf; -break ; -case TASKFILE_NO_DATA : - cmd.protocol =ATA_PROT_NODATA ; -break ; -default : - err = -EFAULT ; +case TASKFILE_MULTI_OUT : +if (!drive->mult_count) { +/* (hs): give up if multcount is not set */ +pr_err ("%s: %s Multimode Write multcount is not set\n" , + drive->name, __func__); + err = -EPERM ; + goto abort; + } + cmd.tf_flags |=IDE_TFLAG_MULTI_PIO ; +/* fall through */ +case TASKFILE_OUT : + cmd.protocol =ATA_PROT_PIO ; +/* fall through */ +case TASKFILE_OUT_DMAQ : +case TASKFILE_OUT_DMA : + cmd.tf_flags |=IDE_TFLAG_WRITE ; + nsect = taskout /SECTOR_SIZE ; + data_buf = outbuf; +break ; +case TASKFILE_MULTI_IN : +if (!drive->mult_count) { +/* (hs): give up if multcount is not set */ +pr_err ("%s: %s Multimode Read multcount is not set\n" , + drive->name, __func__); + err = -EPERM ; goto abort; + } + cmd.tf_flags |=IDE_TFLAG_MULTI_PIO ; +/* fall through */ +case TASKFILE_IN : + cmd.protocol =ATA_PROT_PIO ; +/* fall through */ +case TASKFILE_IN_DMAQ : +case TASKFILE_IN_DMA : + nsect = taskin /SECTOR_SIZE ; + data_buf = inbuf; +break ; +case TASKFILE_NO_DATA : + cmd.protocol =ATA_PROT_NODATA ; +break ; +default : + err = -EFAULT ; + goto abort; }if (req_task->req_cmd ==IDE_DRIVE_TASK_NO_DATA )
@@ -629,7 +624,7 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg) nsect = (cmd.hob.nsect <<8 ) | cmd.tf.nsect;if (!nsect) { -printk (KERN_ERR "%s: in/out command without data\n" , +pr_err ("%s: in/out command without data\n" , drive->name); err = -EFAULT ; goto abort;
@@ -671,8 +666,6 @@ abort:kfree (outbuf);kfree (inbuf); -// printk("IDE Taskfile ioctl ended. rc = %i\n", err); - return err; }#endif
Signature · 1 line
1.6.0.6
Bartlomiej Zolnierkiewicz
Acked-byQuoted 19 lines · On Friday 26 June 2009 05:18:10 Jaswinder Singh Rajput wrote:
Quoted 1 line · Bartlomiej Zolnierkiewicz
Besides I would suggest splitting the patch on fix and cleanup parts.
Here is the cleanup part:
[PATCH] IDE:
ide-taskfile.cfix style problemsFix trivial style problems:
WARNING: Use #include <
linux/uaccess.h> instead of <asm/uaccess.h>
WARNING: space prohibited between function name and open parenthesis '('
WARNING:EXPORT_SYMBOL(foo); should immediately follow its function/variable
ERROR: do not use C99 // comments X 2
ERROR: trailing statements should be on next line
ERROR: trailing whitespace
ERROR: switch and case should be at the same indent
WARNING: line over 80 characters
Quoted 7 lines
total: 5 errors, 4 warnings
Also removed dead code
Also used
pr_err()to avoid line breaksSigned-off-by Jaswinder Singh Rajput <[email protected]>
Hello Bart, David,
Quoted 22 lines · Bartlomiej Zolnierkiewicz
Quoted 21 lines · On Friday 26 June 2009 05:18:10 Jaswinder Singh Rajput wrote:
Quoted 1 line · Bartlomiej Zolnierkiewicz
Besides I would suggest splitting the patch on fix and cleanup parts.
Here is the cleanup part:
[PATCH] IDE:
ide-taskfile.cfix style problemsFix trivial style problems:
WARNING: Use #include <
linux/uaccess.h> instead of <asm/uaccess.h>
WARNING: space prohibited between function name and open parenthesis '('
WARNING:EXPORT_SYMBOL(foo); should immediately follow its function/variable
ERROR: do not use C99 // comments X 2
ERROR: trailing statements should be on next line
ERROR: trailing whitespace
ERROR: switch and case should be at the same indent
WARNING: line over 80 characterstotal: 5 errors, 4 warnings
Quoted 7 lines
Quoted 5 lines
Also removed dead code
Also used
pr_err()to avoid line breaksSigned-off-by Jaswinder Singh Rajput <[email protected]>
Thanks.
If you want I can also fix another ide files.
David, is it OK.
Please let me know which tree I should use bart or David.
Thanks,
--
JSR
David Miller
AppliedFrom: Jaswinder Singh Rajput <[email protected]>
Date: Sat, 27 Jun 2009 14:48:28 +0530
Quoted 11 lines
Hello Bart, David,
Quoted 8 lines · Bartlomiej Zolnierkiewicz
Quoted 7 lines · On Friday 26 June 2009 05:18:10 Jaswinder Singh Rajput wrote:
Quoted 1 line · Bartlomiej Zolnierkiewicz
Besides I would suggest splitting the patch on fix and cleanup parts.
Here is the cleanup part:
[PATCH] IDE:
ide-taskfile.cfix style problems
...
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Jaswinder Singh Rajput <[email protected]>Thanks.
Applied to ide-next-2.6
Quoted 3 lines
If you want I can also fix another ide files.
David, is it OK.
Just don't go overboard as IDE is in deep maintainence mode.