diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-02 19:56:45 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-02 19:56:45 +0100 |
| commit | 92b83c8f3219c36d61a6600ceb422e65c409be59 (patch) | |
| tree | 33629e712ff49fb57b30fb68c0de941af17cea91 /drivers/ide/ide.c | |
| parent | b034304a28d15f019ca914e954c3de20df28065e (diff) | |
| download | linux-92b83c8f3219c36d61a6600ceb422e65c409be59.tar.gz linux-92b83c8f3219c36d61a6600ceb422e65c409be59.tar.bz2 linux-92b83c8f3219c36d61a6600ceb422e65c409be59.zip | |
ide: remove ->nice0 and ->nice2 fields from ide_drive_t
* ->nice0 and ->nice2 ide_drive_t fields are always zero so remove them.
* IDE_NICE_0 and IDE_NICE_2 defines from <linux/hdreg.h> are no longer
used by any kernel code so cover them with #ifndef/#endif __KERNEL__.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide.c')
| -rw-r--r-- | drivers/ide/ide.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index d42216b52a7b..ac6136001615 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -1035,11 +1035,8 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device case HDIO_GET_NICE: return put_user(drive->dsc_overlap << IDE_NICE_DSC_OVERLAP | drive->atapi_overlap << IDE_NICE_ATAPI_OVERLAP | - drive->nice0 << IDE_NICE_0 | - drive->nice1 << IDE_NICE_1 | - drive->nice2 << IDE_NICE_2, + drive->nice1 << IDE_NICE_1, (long __user *) arg); - #ifdef CONFIG_IDE_TASK_IOCTL case HDIO_DRIVE_TASKFILE: if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO)) |