aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-02 13:56:45 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-02 13:56:45 -0500
commit92b83c8f3219c36d61a6600ceb422e65c409be59 (patch)
tree33629e712ff49fb57b30fb68c0de941af17cea91 /drivers/ide/ide.c
parentb034304a28d15f019ca914e954c3de20df28065e (diff)
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.c5
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
1035 case HDIO_GET_NICE: 1035 case HDIO_GET_NICE:
1036 return put_user(drive->dsc_overlap << IDE_NICE_DSC_OVERLAP | 1036 return put_user(drive->dsc_overlap << IDE_NICE_DSC_OVERLAP |
1037 drive->atapi_overlap << IDE_NICE_ATAPI_OVERLAP | 1037 drive->atapi_overlap << IDE_NICE_ATAPI_OVERLAP |
1038 drive->nice0 << IDE_NICE_0 | 1038 drive->nice1 << IDE_NICE_1,
1039 drive->nice1 << IDE_NICE_1 |
1040 drive->nice2 << IDE_NICE_2,
1041 (long __user *) arg); 1039 (long __user *) arg);
1042
1043#ifdef CONFIG_IDE_TASK_IOCTL 1040#ifdef CONFIG_IDE_TASK_IOCTL
1044 case HDIO_DRIVE_TASKFILE: 1041 case HDIO_DRIVE_TASKFILE:
1045 if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO)) 1042 if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))