ide-cd: use ide_drive_t's rq in cdrom_queue_request_sense

There should be no functionality change resulting from this patch.

Suggested-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index d163e6571e09bb356099ef59a1174f7354131ac0..4528e25f2bbb7c90068f945949f1ed3e92a997f3 100644 (file)
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -213,7 +213,7 @@ static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense,
                                      struct request *failed_command)
 {
        struct cdrom_info *info         = drive->driver_data;
-       struct request *rq              = &info->request_sense_request;
+       struct request *rq              = &drive->request_sense_rq;
 
        ide_debug_log(IDE_DBG_SENSE, "enter");
 

diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h
index 3b77dd735088ad4e79dbff3d94b35af2c5fc4b65..1d97101099ce20bab8e0b319f6da278a09bd9afa 100644 (file)
--- a/drivers/ide/ide-cd.h
+++ b/drivers/ide/ide-cd.h
@@ -91,8 +91,6 @@ struct cdrom_info {
           on this device. */
        struct request_sense sense_data;
 
-       struct request request_sense_request;
-
        u8 max_speed;           /* Max speed of the drive. */
        u8 current_speed;       /* Current speed of the drive. */