Skip to content

Commit d7123c7

Browse files
Thinh Nguyengregkh
authored andcommitted
usb: gadget: f_tcm: Refactor goto check_condition
Move the command initialization before the check_condition to after the goto statement for a cleaner look. No functional change here. Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com> Link: https://lore.kernel.org/r/8442364f51f2788d2a191997581a8eda7a143272.1733876548.git.Thinh.Nguyen@synopsys.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent de92fb3 commit d7123c7

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

drivers/usb/gadget/function/f_tcm.c

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,14 +1223,8 @@ static void usbg_submit_cmd(struct usbg_cmd *cmd)
12231223
tpg = cmd->fu->tpg;
12241224
tv_nexus = tpg->tpg_nexus;
12251225
dir = get_cmd_dir(cmd->cmd_buf);
1226-
if (dir < 0) {
1227-
__target_init_cmd(se_cmd,
1228-
tv_nexus->tvn_se_sess->se_tpg->se_tpg_tfo,
1229-
tv_nexus->tvn_se_sess, cmd->data_len, DMA_NONE,
1230-
cmd->prio_attr, cmd->sense_iu.sense,
1231-
cmd->unpacked_lun, NULL);
1226+
if (dir < 0)
12321227
goto out;
1233-
}
12341228

12351229
target_submit_cmd(se_cmd, tv_nexus->tvn_se_sess, cmd->cmd_buf,
12361230
cmd->sense_iu.sense, cmd->unpacked_lun, 0,
@@ -1239,6 +1233,11 @@ static void usbg_submit_cmd(struct usbg_cmd *cmd)
12391233
return;
12401234

12411235
out:
1236+
__target_init_cmd(se_cmd,
1237+
tv_nexus->tvn_se_sess->se_tpg->se_tpg_tfo,
1238+
tv_nexus->tvn_se_sess, cmd->data_len, DMA_NONE,
1239+
cmd->prio_attr, cmd->sense_iu.sense,
1240+
cmd->unpacked_lun, NULL);
12421241
transport_send_check_condition_and_sense(se_cmd,
12431242
TCM_UNSUPPORTED_SCSI_OPCODE, 0);
12441243
}
@@ -1484,21 +1483,20 @@ static void bot_cmd_work(struct work_struct *work)
14841483
tpg = cmd->fu->tpg;
14851484
tv_nexus = tpg->tpg_nexus;
14861485
dir = get_cmd_dir(cmd->cmd_buf);
1487-
if (dir < 0) {
1488-
__target_init_cmd(se_cmd,
1489-
tv_nexus->tvn_se_sess->se_tpg->se_tpg_tfo,
1490-
tv_nexus->tvn_se_sess, cmd->data_len, DMA_NONE,
1491-
cmd->prio_attr, cmd->sense_iu.sense,
1492-
cmd->unpacked_lun, NULL);
1486+
if (dir < 0)
14931487
goto out;
1494-
}
14951488

14961489
target_submit_cmd(se_cmd, tv_nexus->tvn_se_sess,
14971490
cmd->cmd_buf, cmd->sense_iu.sense, cmd->unpacked_lun,
14981491
cmd->data_len, cmd->prio_attr, dir, flags);
14991492
return;
15001493

15011494
out:
1495+
__target_init_cmd(se_cmd,
1496+
tv_nexus->tvn_se_sess->se_tpg->se_tpg_tfo,
1497+
tv_nexus->tvn_se_sess, cmd->data_len, DMA_NONE,
1498+
cmd->prio_attr, cmd->sense_iu.sense,
1499+
cmd->unpacked_lun, NULL);
15021500
transport_send_check_condition_and_sense(se_cmd,
15031501
TCM_UNSUPPORTED_SCSI_OPCODE, 0);
15041502
}

0 commit comments

Comments
 (0)