diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-13 15:39:31 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-13 15:39:31 -0400 |
commit | 67c56364df843fb9e3ed1af014b8fbe4b22ff25d (patch) | |
tree | 586a85b1535038dea95ef2b0bff9f7d6c9fa442e /drivers/ide | |
parent | 844b9468523c8c2c45b90df4efcabcbe4926b5ab (diff) |
ide: add request_sense_{pc,rq} to ide_drive_t
Add 'struct ide_atapi_pc request_sense_pc' and 'request request_sense_rq' to
ide_drive_t and use them instead of fields in struct ide_{floppy,tape}_obj.
There should be no functional changes caused by this patch.
Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-floppy.c | 4 | ||||
-rw-r--r-- | drivers/ide/ide-floppy.h | 3 | ||||
-rw-r--r-- | drivers/ide/ide-tape.c | 7 |
3 files changed, 4 insertions, 10 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 49e702670b8e..6a1ade8ca9fe 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -208,8 +208,8 @@ void ide_floppy_create_request_sense_cmd(struct ide_atapi_pc *pc) | |||
208 | static void idefloppy_retry_pc(ide_drive_t *drive) | 208 | static void idefloppy_retry_pc(ide_drive_t *drive) |
209 | { | 209 | { |
210 | struct ide_floppy_obj *floppy = drive->driver_data; | 210 | struct ide_floppy_obj *floppy = drive->driver_data; |
211 | struct request *rq = &floppy->request_sense_rq; | 211 | struct request *rq = &drive->request_sense_rq; |
212 | struct ide_atapi_pc *pc = &floppy->request_sense_pc; | 212 | struct ide_atapi_pc *pc = &drive->request_sense_pc; |
213 | 213 | ||
214 | (void)ide_read_error(drive); | 214 | (void)ide_read_error(drive); |
215 | ide_floppy_create_request_sense_cmd(pc); | 215 | ide_floppy_create_request_sense_cmd(pc); |
diff --git a/drivers/ide/ide-floppy.h b/drivers/ide/ide-floppy.h index 6eee8d3a7243..e9e14c30fed7 100644 --- a/drivers/ide/ide-floppy.h +++ b/drivers/ide/ide-floppy.h | |||
@@ -18,9 +18,6 @@ typedef struct ide_floppy_obj { | |||
18 | /* used for blk_{fs,pc}_request() requests */ | 18 | /* used for blk_{fs,pc}_request() requests */ |
19 | struct ide_atapi_pc queued_pc; | 19 | struct ide_atapi_pc queued_pc; |
20 | 20 | ||
21 | struct ide_atapi_pc request_sense_pc; | ||
22 | struct request request_sense_rq; | ||
23 | |||
24 | /* Last error information */ | 21 | /* Last error information */ |
25 | u8 sense_key, asc, ascq; | 22 | u8 sense_key, asc, ascq; |
26 | /* delay this long before sending packet command */ | 23 | /* delay this long before sending packet command */ |
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index fe8502afd2ea..72ecc5657db2 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
@@ -182,9 +182,6 @@ typedef struct ide_tape_obj { | |||
182 | /* used by REQ_IDETAPE_{READ,WRITE} requests */ | 182 | /* used by REQ_IDETAPE_{READ,WRITE} requests */ |
183 | struct ide_atapi_pc queued_pc; | 183 | struct ide_atapi_pc queued_pc; |
184 | 184 | ||
185 | struct ide_atapi_pc request_sense_pc; | ||
186 | struct request request_sense_rq; | ||
187 | |||
188 | /* | 185 | /* |
189 | * DSC polling variables. | 186 | * DSC polling variables. |
190 | * | 187 | * |
@@ -600,8 +597,8 @@ static void idetape_create_request_sense_cmd(struct ide_atapi_pc *pc) | |||
600 | static void idetape_retry_pc(ide_drive_t *drive) | 597 | static void idetape_retry_pc(ide_drive_t *drive) |
601 | { | 598 | { |
602 | struct ide_tape_obj *tape = drive->driver_data; | 599 | struct ide_tape_obj *tape = drive->driver_data; |
603 | struct request *rq = &tape->request_sense_rq; | 600 | struct request *rq = &drive->request_sense_rq; |
604 | struct ide_atapi_pc *pc = &tape->request_sense_pc; | 601 | struct ide_atapi_pc *pc = &drive->request_sense_pc; |
605 | 602 | ||
606 | (void)ide_read_error(drive); | 603 | (void)ide_read_error(drive); |
607 | idetape_create_request_sense_cmd(pc); | 604 | idetape_create_request_sense_cmd(pc); |