diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-15 15:21:55 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-15 15:21:55 -0400 |
commit | 92f5daff2b8439fa4c57c57f47823ffc459c3bd9 (patch) | |
tree | 77a122aaa1ff0291f646ecaa7f72b309bf18f9f9 /drivers/ide | |
parent | 5985e6abbd89f969c17fd80ab864c80f089827a3 (diff) |
ide-tape: make pc->idetape_callback void
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-tape.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index d387aaf0eb39..88d26efdf844 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
@@ -619,7 +619,7 @@ static int idetape_end_request(ide_drive_t *drive, int uptodate, int nr_sects) | |||
619 | return 0; | 619 | return 0; |
620 | } | 620 | } |
621 | 621 | ||
622 | static ide_startstop_t ide_tape_callback(ide_drive_t *drive) | 622 | static void ide_tape_callback(ide_drive_t *drive) |
623 | { | 623 | { |
624 | idetape_tape_t *tape = drive->driver_data; | 624 | idetape_tape_t *tape = drive->driver_data; |
625 | struct ide_atapi_pc *pc = tape->pc; | 625 | struct ide_atapi_pc *pc = tape->pc; |
@@ -675,8 +675,6 @@ static ide_startstop_t ide_tape_callback(ide_drive_t *drive) | |||
675 | } | 675 | } |
676 | 676 | ||
677 | idetape_end_request(drive, uptodate, 0); | 677 | idetape_end_request(drive, uptodate, 0); |
678 | |||
679 | return ide_stopped; | ||
680 | } | 678 | } |
681 | 679 | ||
682 | static void idetape_init_pc(struct ide_atapi_pc *pc) | 680 | static void idetape_init_pc(struct ide_atapi_pc *pc) |
@@ -843,7 +841,8 @@ static ide_startstop_t idetape_pc_intr(ide_drive_t *drive) | |||
843 | if (tape->failed_pc == pc) | 841 | if (tape->failed_pc == pc) |
844 | tape->failed_pc = NULL; | 842 | tape->failed_pc = NULL; |
845 | /* Command finished - Call the callback function */ | 843 | /* Command finished - Call the callback function */ |
846 | return pc->idetape_callback(drive); | 844 | pc->idetape_callback(drive); |
845 | return ide_stopped; | ||
847 | } | 846 | } |
848 | 847 | ||
849 | if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) { | 848 | if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) { |
@@ -1035,7 +1034,8 @@ static ide_startstop_t idetape_issue_pc(ide_drive_t *drive, | |||
1035 | pc->error = IDETAPE_ERROR_GENERAL; | 1034 | pc->error = IDETAPE_ERROR_GENERAL; |
1036 | } | 1035 | } |
1037 | tape->failed_pc = NULL; | 1036 | tape->failed_pc = NULL; |
1038 | return pc->idetape_callback(drive); | 1037 | pc->idetape_callback(drive); |
1038 | return ide_stopped; | ||
1039 | } | 1039 | } |
1040 | debug_log(DBG_SENSE, "Retry #%d, cmd = %02X\n", pc->retries, pc->c[0]); | 1040 | debug_log(DBG_SENSE, "Retry #%d, cmd = %02X\n", pc->retries, pc->c[0]); |
1041 | 1041 | ||
@@ -1120,7 +1120,8 @@ static ide_startstop_t idetape_media_access_finished(ide_drive_t *drive) | |||
1120 | pc->error = IDETAPE_ERROR_GENERAL; | 1120 | pc->error = IDETAPE_ERROR_GENERAL; |
1121 | tape->failed_pc = NULL; | 1121 | tape->failed_pc = NULL; |
1122 | } | 1122 | } |
1123 | return pc->idetape_callback(drive); | 1123 | pc->idetape_callback(drive); |
1124 | return ide_stopped; | ||
1124 | } | 1125 | } |
1125 | 1126 | ||
1126 | static void idetape_create_read_cmd(idetape_tape_t *tape, | 1127 | static void idetape_create_read_cmd(idetape_tape_t *tape, |