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>

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index d42216b52a7..ac613600161 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))