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>

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 105e4d855e6ee978ad4e1b2721b23c54e5f0ba90..34981f578e26e9613904074604d9a4de4af16370 100644 (file)
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -520,10 +520,13 @@ end_request:
  * will be called immediately after the drive is prepared for the transfer.
  */
 static ide_startstop_t cdrom_start_packet_command(ide_drive_t *drive,
-                                                 int xferlen,
                                                  ide_handler_t *handler)
 {
        ide_hwif_t *hwif = drive->hwif;
+       struct request *rq = hwif->hwgroup->rq;
+       int xferlen;
+
+       xferlen = ide_cd_get_xferlen(rq);
 
        ide_debug_log(IDE_DBG_PC, "Call %s, xferlen: %d\n", __func__, xferlen);
 
@@ -1175,15 +1178,12 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
                                        sector_t block)
 {
        ide_handler_t *fn;
-       int xferlen;
 
        ide_debug_log(IDE_DBG_RQ, "Call %s, rq->cmd[0]: 0x%x, "
                      "rq->cmd_type: 0x%x, block: %llu\n",
                      __func__, rq->cmd[0], rq->cmd_type,
                      (unsigned long long)block);
 
-       xferlen = ide_cd_get_xferlen(rq);
-
        if (blk_fs_request(rq)) {
                fn = cdrom_start_rw_cont;
 
@@ -1210,7 +1210,7 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
                return ide_stopped;
        }
 
-       return cdrom_start_packet_command(drive, xferlen, fn);
+       return cdrom_start_packet_command(drive, fn);
 }
 
 /*