Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: ufs: core: Remove goto statements from ufshcd_try_to_abort_task()

The only statement that follows the 'out:' label in
ufshcd_try_to_abort_task() is a return-statement. Simplify this function
by changing 'goto out' statements into return statements.

Reviewed-by: Avri Altman <avri.altman@wdc.com>
Reviewed-by: Peter Wang <peter.wang@mediatek.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20241022193130.2733293-3-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Bart Van Assche and committed by
Martin K. Petersen
7df89440 a085e037

+7 -12
+7 -12
drivers/ufs/core/ufshcd.c
··· 7485 7485 int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag) 7486 7486 { 7487 7487 struct ufshcd_lrb *lrbp = &hba->lrb[tag]; 7488 - int err = 0; 7488 + int err; 7489 7489 int poll_cnt; 7490 7490 u8 resp = 0xF; 7491 7491 u32 reg; ··· 7515 7515 /* command completed already */ 7516 7516 dev_err(hba->dev, "%s: cmd at tag=%d is cleared.\n", 7517 7517 __func__, tag); 7518 - goto out; 7518 + return 0; 7519 7519 } 7520 7520 7521 7521 /* Single Doorbell Mode */ ··· 7528 7528 /* command completed already */ 7529 7529 dev_err(hba->dev, "%s: cmd at tag %d successfully cleared from DB.\n", 7530 7530 __func__, tag); 7531 - goto out; 7531 + return 0; 7532 7532 } else { 7533 7533 dev_err(hba->dev, 7534 7534 "%s: no response from device. tag = %d, err %d\n", 7535 7535 __func__, tag, err); 7536 - if (!err) 7537 - err = resp; /* service response error */ 7538 - goto out; 7536 + return err ? : resp; 7539 7537 } 7540 7538 } 7541 7539 7542 - if (!poll_cnt) { 7543 - err = -EBUSY; 7544 - goto out; 7545 - } 7540 + if (!poll_cnt) 7541 + return -EBUSY; 7546 7542 7547 7543 err = ufshcd_issue_tm_cmd(hba, lrbp->lun, lrbp->task_tag, 7548 7544 UFS_ABORT_TASK, &resp); ··· 7548 7552 dev_err(hba->dev, "%s: issued. tag = %d, err %d\n", 7549 7553 __func__, tag, err); 7550 7554 } 7551 - goto out; 7555 + return err; 7552 7556 } 7553 7557 7554 7558 err = ufshcd_clear_cmd(hba, tag); ··· 7556 7560 dev_err(hba->dev, "%s: Failed clearing cmd at tag %d, err %d\n", 7557 7561 __func__, tag, err); 7558 7562 7559 - out: 7560 7563 return err; 7561 7564 } 7562 7565