diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-13 15:39:32 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-13 15:39:32 -0400 |
commit | baf08f0be6d986521bb2fbdc7af51fc4847da734 (patch) | |
tree | 5ac765703ad79edeafc6eec39fe42850bd6b5dc6 /drivers/ide/ide-tape.c | |
parent | aa5d2de7b080873f6d9ac3aede423c9713bf0caa (diff) |
ide: make ide_transfer_pc() static
* Move ->ticks field from struct ide_floppy_obj to ide_drive_t.
* Move idefloppy_transfer_pc() to ide-atapi.c and make
ide_transfer_pc() use it.
* Always use ide_transfer_pc as a handler in ide_issue_pc().
* Remove no longer used idefloppy_start_pc_transfer(),
ide*_transfer_pc() and 'handler' argument from ide_issue_pc().
* Make ide_transfer_pc() static.
While at it:
* idefloppy_transfer_pc() -> ide_delayed_transfer_pc()
* IDEFLOPPY_TICKS_DELAY -> IDEFLOPPY_PC_DELAY
* ->ticks -> ->pc_delay
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/ide-tape.c')
-rw-r--r-- | drivers/ide/ide-tape.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index a148de623af0..622d5fed2dc5 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
@@ -654,10 +654,6 @@ static int ide_tape_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc, | |||
654 | * again, the callback function will be called and then we will handle the next | 654 | * again, the callback function will be called and then we will handle the next |
655 | * request. | 655 | * request. |
656 | */ | 656 | */ |
657 | static ide_startstop_t idetape_transfer_pc(ide_drive_t *drive) | ||
658 | { | ||
659 | return ide_transfer_pc(drive, WAIT_TAPE_CMD, NULL); | ||
660 | } | ||
661 | 657 | ||
662 | static ide_startstop_t idetape_issue_pc(ide_drive_t *drive, | 658 | static ide_startstop_t idetape_issue_pc(ide_drive_t *drive, |
663 | struct ide_atapi_pc *pc) | 659 | struct ide_atapi_pc *pc) |
@@ -705,7 +701,7 @@ static ide_startstop_t idetape_issue_pc(ide_drive_t *drive, | |||
705 | 701 | ||
706 | pc->retries++; | 702 | pc->retries++; |
707 | 703 | ||
708 | return ide_issue_pc(drive, idetape_transfer_pc, WAIT_TAPE_CMD, NULL); | 704 | return ide_issue_pc(drive, WAIT_TAPE_CMD, NULL); |
709 | } | 705 | } |
710 | 706 | ||
711 | /* A mode sense command is used to "sense" tape parameters. */ | 707 | /* A mode sense command is used to "sense" tape parameters. */ |