ide: fix sparse warning about shadowing 'flags' symbol
PATCH 1/4 ide: fix sparse warning about shadowing 'flags' symbol
drivers/ide/ide.c:801:18: warning: symbol 'flags' shadows an earlier one drivers/ide/ide.c:732:16: originally declared here
Also fix some whitespace damage while at it.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/ide/ide.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/ide/ide.c +5 -8
@@ -797,10 +797,9 @@ int generic_ide_ioctl(ide_drive_t *drive drive->nice1 = (arg >>IDE_NICE_1 ) &1 ;return 0 ;case HDIO_DRIVE_RESET : - { -unsigned long flags; -if (!capable (CAP_SYS_ADMIN ))return -EACCES ; - +if (!capable (CAP_SYS_ADMIN )) +return -EACCES ; +/* * Abort the current command on the * group if there is one, taking
@@ -819,17 +818,15 @@ int generic_ide_ioctl(ide_drive_t *driveide_abort (drive,"drive reset" );BUG_ON (HWGROUP (drive)->handler); - +/* Ensure nothing gets queued after we drop the lock. Reset will clear the busy */ - +HWGROUP (drive)->busy =1 ;spin_unlock_irqrestore (&ide_lock, flags); (void )ide_do_reset (drive);return 0 ; - } -case HDIO_GET_BUSSTATE :if (!capable (CAP_SYS_ADMIN ))return -EACCES ;
Quoted 6 lines · Bartlomiej Zolnierkiewicz
drivers/ide/ide.c:801:18: warning: symbol 'flags' shadows an earlier onedrivers/ide/ide.c:732:16: originally declared hereAlso fix some whitespace damage while at it.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
Acked-by Sergei Shtylyov <[email protected]>
MBR, Sergei
Quoted 6 lines · Bartlomiej Zolnierkiewicz
drivers/ide/ide.c:801:18: warning: symbol 'flags' shadows an earlier onedrivers/ide/ide.c:732:16: originally declared hereAlso fix some whitespace damage while at it.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
Acked-by Sergei Shtylyov <[email protected]>
MBR, Sergei