diff options
author | Tejun Heo <tj@kernel.org> | 2009-04-18 19:46:03 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-04-18 19:46:03 -0400 |
commit | 6d7003877c2f0578f1c08f66d05c3f72ef4ae596 (patch) | |
tree | 81e2ba44a3b12c1b946adc8a9453506a52405976 /include/linux/ide.h | |
parent | 07bd9686c50c2b1f10e48089d4fb836a971f5177 (diff) |
ide-atapi: kill unused fields and callbacks
Impact: remove fields and code paths which are no longer necessary
Now that ide-tape uses standard mechanisms to transfer data, special
case handling for bh handling can be dropped from ide-atapi. Drop the
followings.
* pc->cur_pos, b_count, bh and b_data
* drive->pc_update_buffers() and pc_io_buffers().
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r-- | include/linux/ide.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 1957461ac762..34c128f0a33c 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -362,11 +362,7 @@ struct ide_atapi_pc { | |||
362 | 362 | ||
363 | /* data buffer */ | 363 | /* data buffer */ |
364 | u8 *buf; | 364 | u8 *buf; |
365 | /* current buffer position */ | ||
366 | u8 *cur_pos; | ||
367 | int buf_size; | 365 | int buf_size; |
368 | /* missing/available data on the current buffer */ | ||
369 | int b_count; | ||
370 | 366 | ||
371 | /* the corresponding request */ | 367 | /* the corresponding request */ |
372 | struct request *rq; | 368 | struct request *rq; |
@@ -379,10 +375,6 @@ struct ide_atapi_pc { | |||
379 | */ | 375 | */ |
380 | u8 pc_buf[IDE_PC_BUFFER_SIZE]; | 376 | u8 pc_buf[IDE_PC_BUFFER_SIZE]; |
381 | 377 | ||
382 | /* idetape only */ | ||
383 | struct idetape_bh *bh; | ||
384 | char *b_data; | ||
385 | |||
386 | unsigned long timeout; | 378 | unsigned long timeout; |
387 | }; | 379 | }; |
388 | 380 | ||
@@ -595,10 +587,6 @@ struct ide_drive_s { | |||
595 | /* callback for packet commands */ | 587 | /* callback for packet commands */ |
596 | int (*pc_callback)(struct ide_drive_s *, int); | 588 | int (*pc_callback)(struct ide_drive_s *, int); |
597 | 589 | ||
598 | void (*pc_update_buffers)(struct ide_drive_s *, struct ide_atapi_pc *); | ||
599 | int (*pc_io_buffers)(struct ide_drive_s *, struct ide_atapi_pc *, | ||
600 | unsigned int, int); | ||
601 | |||
602 | ide_startstop_t (*irq_handler)(struct ide_drive_s *); | 590 | ide_startstop_t (*irq_handler)(struct ide_drive_s *); |
603 | 591 | ||
604 | unsigned long atapi_flags; | 592 | unsigned long atapi_flags; |