Skip to content

Commit 7df8944

Browse files
bvanasschemartinkpetersen
authored andcommitted
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>
1 parent a085e03 commit 7df8944

1 file changed

Lines changed: 7 additions & 12 deletions

File tree

drivers/ufs/core/ufshcd.c

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7485,7 +7485,7 @@ static void ufshcd_set_req_abort_skip(struct ufs_hba *hba, unsigned long bitmap)
74857485
int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag)
74867486
{
74877487
struct ufshcd_lrb *lrbp = &hba->lrb[tag];
7488-
int err = 0;
7488+
int err;
74897489
int poll_cnt;
74907490
u8 resp = 0xF;
74917491
u32 reg;
@@ -7515,7 +7515,7 @@ int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag)
75157515
/* command completed already */
75167516
dev_err(hba->dev, "%s: cmd at tag=%d is cleared.\n",
75177517
__func__, tag);
7518-
goto out;
7518+
return 0;
75197519
}
75207520

75217521
/* Single Doorbell Mode */
@@ -7528,21 +7528,17 @@ int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag)
75287528
/* command completed already */
75297529
dev_err(hba->dev, "%s: cmd at tag %d successfully cleared from DB.\n",
75307530
__func__, tag);
7531-
goto out;
7531+
return 0;
75327532
} else {
75337533
dev_err(hba->dev,
75347534
"%s: no response from device. tag = %d, err %d\n",
75357535
__func__, tag, err);
7536-
if (!err)
7537-
err = resp; /* service response error */
7538-
goto out;
7536+
return err ? : resp;
75397537
}
75407538
}
75417539

7542-
if (!poll_cnt) {
7543-
err = -EBUSY;
7544-
goto out;
7545-
}
7540+
if (!poll_cnt)
7541+
return -EBUSY;
75467542

75477543
err = ufshcd_issue_tm_cmd(hba, lrbp->lun, lrbp->task_tag,
75487544
UFS_ABORT_TASK, &resp);
@@ -7552,15 +7548,14 @@ int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag)
75527548
dev_err(hba->dev, "%s: issued. tag = %d, err %d\n",
75537549
__func__, tag, err);
75547550
}
7555-
goto out;
7551+
return err;
75567552
}
75577553

75587554
err = ufshcd_clear_cmd(hba, tag);
75597555
if (err)
75607556
dev_err(hba->dev, "%s: Failed clearing cmd at tag %d, err %d\n",
75617557
__func__, tag, err);
75627558

7563-
out:
75647559
return err;
75657560
}
75667561

0 commit comments

Comments
 (0)