diff options
| author | Chanwoo Lee <cw9316.lee@samsung.com> | 2026-05-29 09:16:19 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2026-06-02 05:01:54 +0300 |
| commit | 0600eec09ad6cc5ba3ca78aceb6fa8dcbad010bb (patch) | |
| tree | bc7d1b07c47f1e74827c43e762fdb2341609105c | |
| parent | 6bfc4bfd041d7ddeab9791f0592284585e960be4 (diff) | |
| download | linux-0600eec09ad6cc5ba3ca78aceb6fa8dcbad010bb.tar.xz | |
scsi: ufs: Remove redundant vops NULL check and trivial wrapper
ufshcd_variant_hba_init/exit() check 'if (!hba->vops)' before calling
vops wrappers, but the wrappers already do NULL check internally. Remove
the redundant checks. Also remove ufshcd_variant_hba_exit() entirely
since it only wraps ufshcd_vops_exit() with no added value.
Signed-off-by: Chanwoo Lee <cw9316.lee@samsung.com>
Reviewed-by: Peter Wang <peter.wang@mediatek.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Link: https://patch.msgid.link/20260529061623.301291-1-cw9316.lee@samsung.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
| -rw-r--r-- | drivers/ufs/core/ufshcd.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 3441e874eacc..60ec2c63c2d8 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -9854,28 +9854,15 @@ out: static int ufshcd_variant_hba_init(struct ufs_hba *hba) { - int err = 0; - - if (!hba->vops) - goto out; + int err = ufshcd_vops_init(hba); - err = ufshcd_vops_init(hba); if (err) dev_err_probe(hba->dev, err, "%s: variant %s init failed with err %d\n", __func__, ufshcd_get_var_name(hba), err); -out: return err; } -static void ufshcd_variant_hba_exit(struct ufs_hba *hba) -{ - if (!hba->vops) - return; - - ufshcd_vops_exit(hba); -} - static int ufshcd_hba_init(struct ufs_hba *hba) { int err; @@ -9943,7 +9930,7 @@ static void ufshcd_hba_exit(struct ufs_hba *hba) if (hba->eh_wq) destroy_workqueue(hba->eh_wq); ufs_debugfs_hba_exit(hba); - ufshcd_variant_hba_exit(hba); + ufshcd_vops_exit(hba); ufshcd_setup_vreg(hba, false); ufshcd_setup_clocks(hba, false); ufshcd_setup_hba_vreg(hba, false); |