hi Jinyoung,
On Wed, Aug 3, 2022 at 12:11 PM Jinyoung CHOI <j-young.choi@xxxxxxxxxxx> wrote:
>
> Hi, Stanley,
>
> >Hi,
> >
> >On Tue, Aug 2, 2022 at 4:29 PM Jinyoung CHOI <j-young.choi@xxxxxxxxxxx> wrote:
> >>
> >> Messages are modified to fit the format of others.
> >>
> >> Reviewed-by: Avri Altman <avri.altman@xxxxxxx>
> >> Reviewed-by: Bart Van Assche <bvanassche@xxxxxxx>
> >> Signed-off-by: Jinyoung Choi <j-young.choi@xxxxxxxxxxx>
> >> ---
> >> drivers/ufs/core/ufs-sysfs.c | 2 +-
> >> drivers/ufs/core/ufshcd.c | 23 +++++++++++------------
> >> 2 files changed, 12 insertions(+), 13 deletions(-)
> >>
> >> diff --git a/drivers/ufs/core/ufs-sysfs.c b/drivers/ufs/core/ufs-sysfs.c
> >> index 2c0b7f45de4b..117272cf7d61 100644
> >> --- a/drivers/ufs/core/ufs-sysfs.c
> >> +++ b/drivers/ufs/core/ufs-sysfs.c
> >> @@ -230,7 +230,7 @@ static ssize_t wb_on_store(struct device *dev, struct device_attribute *attr,
> >> * If the platform supports UFSHCD_CAP_CLK_SCALING, turn WB
> >> * on/off will be done while clock scaling up/down.
> >> */
> >> - dev_warn(dev, "To control WB through wb_on is not allowed!\n");
> >> + dev_warn(dev, "It is not allowed to configure WB!\n");
> >> return -EOPNOTSUPP;
> >> }
> >>
> >> diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
> >> index 5099d161f115..dcd7f03db2a2 100644
> >> --- a/drivers/ufs/core/ufshcd.c
> >> +++ b/drivers/ufs/core/ufshcd.c
> >> @@ -5737,13 +5737,13 @@ int ufshcd_wb_toggle(struct ufs_hba *hba, bool enable)
> >>
> >> ret = __ufshcd_wb_toggle(hba, enable, QUERY_FLAG_IDN_WB_EN);
> >> if (ret) {
> >> - dev_err(hba->dev, "%s Write Booster %s failed %d\n",
> >> - __func__, enable ? "enable" : "disable", ret);
> >> + dev_err(hba->dev, "%s: Write Booster %s failed %d\n",
> >> + __func__, enable ? "enabling" : "disabling", ret);
> >> return ret;
> >> }
> >>
> >> hba->dev_info.wb_enabled = enable;
> >> - dev_info(hba->dev, "%s Write Booster %s\n",
> >> + dev_info(hba->dev, "%s: Write Booster %s\n",
> >> __func__, enable ? "enabled" : "disabled");
> >
> >You need to rebase this patch to follow the latest change as
> >https://lore.kernel.org/all/20220709000027.3929970-1-bjorn.andersson@xxxxxxxxxx/
>
> I am currently working on the latest 5.20/scsi-staging.
> In this case, can I refer the commit of 5.19/scsi-fixes
> and add commit to 5.20/scsi-staging?
> Or can I reflect it in my change?
> I have no experience, so please guide. :)
>
> Thank you for checking.
> Jinyoung.
>
>
I did not notice that the below patch is merged to 5.19/scsi-fixes, so
I guess perhaps you could keep working on the latest
5.20/scsi-staging, and then Martin would help resolve the conflict.
https://lore.kernel.org/all/20220709000027.3929970-1-bjorn.andersson@xxxxxxxxxx/
Thanks,
Stanley
