mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
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 <[email protected]>
This commit is contained in:
parent
bd6dee6f30
commit
642f149031
31 changed files with 98 additions and 161 deletions
|
|
@ -150,13 +150,8 @@ cryptoloop_transfer(struct loop_device *lo, int cmd,
|
|||
u32 iv[4] = { 0, };
|
||||
iv[0] = cpu_to_le32(IV & 0xffffffff);
|
||||
|
||||
sg_set_page(&sg_in, in_page);
|
||||
sg_in.offset = in_offs;
|
||||
sg_in.length = sz;
|
||||
|
||||
sg_set_page(&sg_out, out_page);
|
||||
sg_out.offset = out_offs;
|
||||
sg_out.length = sz;
|
||||
sg_set_page(&sg_in, in_page, sz, in_offs);
|
||||
sg_set_page(&sg_out, out_page, sz, out_offs);
|
||||
|
||||
desc.info = iv;
|
||||
err = encdecfunc(&desc, &sg_out, &sg_in, sz);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue