SG: Change sg_set_page() to take length and offset argument

Most drivers need to set length and offset as well, so may as well fold
those three lines into one.

Add sg_assign_page() for those two locations that only needed to set
the page, where the offset/length is set outside of the function context.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 14143f2c484d..5e740e14ab35 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -1428,9 +1428,8 @@ static void ub_state_sense(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
         scmd->state = UB_CMDST_INIT;
         scmd->nsg = 1;
         sg = &scmd->sgv[0];
-        sg_set_page(sg, virt_to_page(sc->top_sense));
-        sg->offset = (unsigned long)sc->top_sense & (PAGE_SIZE-1);
-        sg->length = UB_SENSE_SIZE;
+        sg_set_page(sg, virt_to_page(sc->top_sense), UB_SENSE_SIZE,
+                        (unsigned long)sc->top_sense & (PAGE_SIZE-1));
         scmd->len = UB_SENSE_SIZE;
         scmd->lun = cmd->lun;
         scmd->done = ub_top_sense_done;
@@ -1864,9 +1863,7 @@ static int ub_sync_read_cap(struct ub_dev *sc, struct ub_lun *lun,
         cmd->state = UB_CMDST_INIT;
         cmd->nsg = 1;
         sg = &cmd->sgv[0];
-        sg_set_page(sg, virt_to_page(p));
-        sg->offset = (unsigned long)p & (PAGE_SIZE-1);
-        sg->length = 8;
+        sg_set_page(sg, virt_to_page(p), 8, (unsigned long)p & (PAGE_SIZE-1));
         cmd->len = 8;
         cmd->lun = lun;
         cmd->done = ub_probe_done;