ide: move command related fields from ide_hwif_t to struct ide_cmd

* Move command related fields from ide_hwif_t to struct ide_cmd.

* Make ide_init_sg_cmd() take command and sectors number as arguments.

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 5625946739ad..f56e9a918b99 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -244,6 +244,7 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
 {
         struct ide_disk_obj *floppy = drive->driver_data;
         ide_hwif_t *hwif = drive->hwif;
+        struct ide_cmd *cmd = &hwif->cmd;
         struct ide_atapi_pc *pc;
 
         if (drive->debug_mask & IDE_DBG_RQ)
@@ -285,12 +286,12 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
         }
 
         if (blk_fs_request(rq) || pc->req_xfer) {
-                ide_init_sg_cmd(drive, rq);
+                ide_init_sg_cmd(cmd, rq->nr_sectors);
                 ide_map_sg(drive, rq);
         }
 
         pc->sg = hwif->sg_table;
-        pc->sg_cnt = hwif->sg_nents;
+        pc->sg_cnt = cmd->sg_nents;
 
         pc->rq = rq;