| Message ID | 20240822213645.1125016-3-bvanassche@acm.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Simplify the UFS driver initialization code | expand |
> Prepare for introducing a second caller by moving the code for activating the link > between UFS controller and device into a new function. No functionality has been > changed. > > Signed-off-by: Bart Van Assche <bvanassche@acm.org> Reviewed-by: Avri Altman <avri.altman@wdc.com>
On Thu, Aug 22, 2024 at 02:36:03PM -0700, Bart Van Assche wrote: > Prepare for introducing a second caller by moving the code for > activating the link between UFS controller and device into a new > function. No functionality has been changed. > > Signed-off-by: Bart Van Assche <bvanassche@acm.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> - Mani > --- > drivers/ufs/core/ufshcd.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c > index d29e469c3873..04d94bf5cc2d 100644 > --- a/drivers/ufs/core/ufshcd.c > +++ b/drivers/ufs/core/ufshcd.c > @@ -8733,10 +8733,9 @@ static void ufshcd_config_mcq(struct ufs_hba *hba) > hba->nutrs); > } > > -static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params) > +static int ufshcd_activate_link(struct ufs_hba *hba) > { > int ret; > - struct Scsi_Host *host = hba->host; > > hba->ufshcd_state = UFSHCD_STATE_RESET; > > @@ -8753,6 +8752,18 @@ static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params) > /* UniPro link is active now */ > ufshcd_set_link_active(hba); > > + return 0; > +} > + > +static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params) > +{ > + struct Scsi_Host *host = hba->host; > + int ret; > + > + ret = ufshcd_activate_link(hba); > + if (ret) > + return ret; > + > /* Reconfigure MCQ upon reset */ > if (hba->mcq_enabled && !init_dev_params) { > ufshcd_config_mcq(hba);
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index d29e469c3873..04d94bf5cc2d 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -8733,10 +8733,9 @@ static void ufshcd_config_mcq(struct ufs_hba *hba) hba->nutrs); } -static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params) +static int ufshcd_activate_link(struct ufs_hba *hba) { int ret; - struct Scsi_Host *host = hba->host; hba->ufshcd_state = UFSHCD_STATE_RESET; @@ -8753,6 +8752,18 @@ static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params) /* UniPro link is active now */ ufshcd_set_link_active(hba); + return 0; +} + +static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params) +{ + struct Scsi_Host *host = hba->host; + int ret; + + ret = ufshcd_activate_link(hba); + if (ret) + return ret; + /* Reconfigure MCQ upon reset */ if (hba->mcq_enabled && !init_dev_params) { ufshcd_config_mcq(hba);
Prepare for introducing a second caller by moving the code for activating the link between UFS controller and device into a new function. No functionality has been changed. Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- drivers/ufs/core/ufshcd.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)