소스 검색

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>
Borislav Petkov 16 년 전
부모
커밋
3f2154d7e7
2개의 변경된 파일1개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      drivers/ide/ide-cd.c
  2. 0 2
      drivers/ide/ide-cd.h

+ 1 - 1
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 request *failed_command)
 {
 {
 	struct cdrom_info *info		= drive->driver_data;
 	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");
 	ide_debug_log(IDE_DBG_SENSE, "enter");
 
 

+ 0 - 2
drivers/ide/ide-cd.h

@@ -91,8 +91,6 @@ struct cdrom_info {
 	   on this device. */
 	   on this device. */
 	struct request_sense sense_data;
 	struct request_sense sense_data;
 
 
-	struct request request_sense_request;
-
 	u8 max_speed;		/* Max speed of the drive. */
 	u8 max_speed;		/* Max speed of the drive. */
 	u8 current_speed;	/* Current speed of the drive. */
 	u8 current_speed;	/* Current speed of the drive. */