mirror of
https://github.com/torvalds/linux.git
synced 2024-09-27 02:13:14 +00:00
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. Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
bcd88ac3b2
commit
dbecebca19
|
@ -1031,10 +1031,9 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
|
||||||
drive->nice1 = (arg >> IDE_NICE_1) & 1;
|
drive->nice1 = (arg >> IDE_NICE_1) & 1;
|
||||||
return 0;
|
return 0;
|
||||||
case HDIO_DRIVE_RESET:
|
case HDIO_DRIVE_RESET:
|
||||||
{
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
unsigned long flags;
|
return -EACCES;
|
||||||
if (!capable(CAP_SYS_ADMIN)) return -EACCES;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Abort the current command on the
|
* Abort the current command on the
|
||||||
* group if there is one, taking
|
* group if there is one, taking
|
||||||
|
@ -1053,17 +1052,15 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
|
||||||
ide_abort(drive, "drive reset");
|
ide_abort(drive, "drive reset");
|
||||||
|
|
||||||
BUG_ON(HWGROUP(drive)->handler);
|
BUG_ON(HWGROUP(drive)->handler);
|
||||||
|
|
||||||
/* Ensure nothing gets queued after we
|
/* Ensure nothing gets queued after we
|
||||||
drop the lock. Reset will clear the busy */
|
drop the lock. Reset will clear the busy */
|
||||||
|
|
||||||
HWGROUP(drive)->busy = 1;
|
HWGROUP(drive)->busy = 1;
|
||||||
spin_unlock_irqrestore(&ide_lock, flags);
|
spin_unlock_irqrestore(&ide_lock, flags);
|
||||||
(void) ide_do_reset(drive);
|
(void) ide_do_reset(drive);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
|
||||||
|
|
||||||
case HDIO_GET_BUSSTATE:
|
case HDIO_GET_BUSSTATE:
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
return -EACCES;
|
return -EACCES;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user