diff options
author | Borislav Petkov <petkovbb@googlemail.com> | 2009-01-02 10:12:55 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-01-02 10:12:55 -0500 |
commit | 563d993153ab16d829ba373c5c070a118eb1eba4 (patch) | |
tree | e659575267b8d661018cec851b946e8b29d3a5ac /drivers/ide/ide-cd.c | |
parent | d77612ab0ad7515623b084b952dfefd547073ada (diff) |
ide-cd: remove xferlen arg to cdrom_start_packet_command
There should be no functionality change resulting from this patch.
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-cd.c')
-rw-r--r-- | drivers/ide/ide-cd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 105e4d855e6e..34981f578e26 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -520,10 +520,13 @@ end_request: | |||
520 | * will be called immediately after the drive is prepared for the transfer. | 520 | * will be called immediately after the drive is prepared for the transfer. |
521 | */ | 521 | */ |
522 | static ide_startstop_t cdrom_start_packet_command(ide_drive_t *drive, | 522 | static ide_startstop_t cdrom_start_packet_command(ide_drive_t *drive, |
523 | int xferlen, | ||
524 | ide_handler_t *handler) | 523 | ide_handler_t *handler) |
525 | { | 524 | { |
526 | ide_hwif_t *hwif = drive->hwif; | 525 | ide_hwif_t *hwif = drive->hwif; |
526 | struct request *rq = hwif->hwgroup->rq; | ||
527 | int xferlen; | ||
528 | |||
529 | xferlen = ide_cd_get_xferlen(rq); | ||
527 | 530 | ||
528 | ide_debug_log(IDE_DBG_PC, "Call %s, xferlen: %d\n", __func__, xferlen); | 531 | ide_debug_log(IDE_DBG_PC, "Call %s, xferlen: %d\n", __func__, xferlen); |
529 | 532 | ||
@@ -1175,15 +1178,12 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq, | |||
1175 | sector_t block) | 1178 | sector_t block) |
1176 | { | 1179 | { |
1177 | ide_handler_t *fn; | 1180 | ide_handler_t *fn; |
1178 | int xferlen; | ||
1179 | 1181 | ||
1180 | ide_debug_log(IDE_DBG_RQ, "Call %s, rq->cmd[0]: 0x%x, " | 1182 | ide_debug_log(IDE_DBG_RQ, "Call %s, rq->cmd[0]: 0x%x, " |
1181 | "rq->cmd_type: 0x%x, block: %llu\n", | 1183 | "rq->cmd_type: 0x%x, block: %llu\n", |
1182 | __func__, rq->cmd[0], rq->cmd_type, | 1184 | __func__, rq->cmd[0], rq->cmd_type, |
1183 | (unsigned long long)block); | 1185 | (unsigned long long)block); |
1184 | 1186 | ||
1185 | xferlen = ide_cd_get_xferlen(rq); | ||
1186 | |||
1187 | if (blk_fs_request(rq)) { | 1187 | if (blk_fs_request(rq)) { |
1188 | fn = cdrom_start_rw_cont; | 1188 | fn = cdrom_start_rw_cont; |
1189 | 1189 | ||
@@ -1210,7 +1210,7 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq, | |||
1210 | return ide_stopped; | 1210 | return ide_stopped; |
1211 | } | 1211 | } |
1212 | 1212 | ||
1213 | return cdrom_start_packet_command(drive, xferlen, fn); | 1213 | return cdrom_start_packet_command(drive, fn); |
1214 | } | 1214 | } |
1215 | 1215 | ||
1216 | /* | 1216 | /* |