moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: scsi: ufs: wb: Modify messages

Browse Source 
Modify messages to fit the format of others.

Link: https://lore.kernel.org/r/20220804075519epcms2p148b6ae956b172925b26304b50d6a0da9@epcms2p1
Reviewed-by: Avri Altman <avri.altman@wdc.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Change-Id: I13315ad2ff5d48b44b396d873961f116b5132afb
Signed-off-by: Jinyoung Choi <j-young.choi@samsung.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Bug: 258234315
(cherry picked from commit 4f6b69f364a6c70147adca9b970821c3b710b770)
Signed-off-by: Bart Van Assche <bvanassche@google.com>
This commit is contained in:
Jinyoung Choi
2022-08-04 16:55:19 +09:00
committed by Alistair Delva
parent 8d5ce8adb9
commit 2d02f81b28
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ufs/core/ufs-sysfs.c
View File

@@ -233,7 +233,7 @@ static ssize_t wb_on_store(struct device *dev, struct device_attribute *attr,
* If the platform supports UFSHCD_CAP_CLK_SCALING, turn WB * If the platform supports UFSHCD_CAP_CLK_SCALING, turn WB
* on/off will be done while clock scaling up/down. * 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; return -EOPNOTSUPP;
} }

23
drivers/ufs/core/ufshcd.c
View File

@@ -5840,13 +5840,13 @@ int ufshcd_wb_toggle(struct ufs_hba *hba, bool enable)
ret = __ufshcd_wb_toggle(hba, enable, QUERY_FLAG_IDN_WB_EN); ret = __ufshcd_wb_toggle(hba, enable, QUERY_FLAG_IDN_WB_EN);
if (ret) { if (ret) {
dev_err(hba->dev, "%s Write Booster %s failed %d\n", dev_err(hba->dev, "%s: Write Booster %s failed %d\n",
__func__, enable ? "enable" : "disable", ret); __func__, enable ? "enabling" : "disabling", ret);
return ret; return ret;
} }
hba->dev_info.wb_enabled = enable; hba->dev_info.wb_enabled = enable;
dev_dbg(hba->dev, "%s Write Booster %s\n", dev_dbg(hba->dev, "%s: Write Booster %s\n",
__func__, enable ? "enabled" : "disabled"); __func__, enable ? "enabled" : "disabled");
return ret; return ret;
@@ -5860,11 +5860,11 @@ static void ufshcd_wb_toggle_buf_flush_during_h8(struct ufs_hba *hba,
ret = __ufshcd_wb_toggle(hba, enable, ret = __ufshcd_wb_toggle(hba, enable,
QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8); QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8);
if (ret) { if (ret) {
dev_err(hba->dev, "%s: WB-Buf Flush during H8 %s failed: %d\n", dev_err(hba->dev, "%s: WB-Buf Flush during H8 %s failed %d\n",
__func__, enable ? "enable" : "disable", ret); __func__, enable ? "enabling" : "disabling", ret);
return; return;
} }
dev_dbg(hba->dev, "%s WB-Buf Flush during H8 %s\n", dev_dbg(hba->dev, "%s: WB-Buf Flush during H8 %s\n",
__func__, enable ? "enabled" : "disabled"); __func__, enable ? "enabled" : "disabled");
} }
@@ -5878,14 +5878,13 @@ int ufshcd_wb_toggle_buf_flush(struct ufs_hba *hba, bool enable)
ret = __ufshcd_wb_toggle(hba, enable, QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN); ret = __ufshcd_wb_toggle(hba, enable, QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN);
if (ret) { if (ret) {
dev_err(hba->dev, "%s WB-Buf Flush %s failed %d\n", __func__, dev_err(hba->dev, "%s: WB-Buf Flush %s failed %d\n",
enable ? "enable" : "disable", ret); __func__, enable ? "enabling" : "disabling", ret);
return ret; return ret;
} }
hba->dev_info.wb_buf_flush_enabled = enable; hba->dev_info.wb_buf_flush_enabled = enable;
dev_dbg(hba->dev, "%s: WB-Buf Flush %s\n",
dev_dbg(hba->dev, "%s WB-Buf Flush %s\n",
__func__, enable ? "enabled" : "disabled"); __func__, enable ? "enabled" : "disabled");
return ret; return ret;
@@ -5903,7 +5902,7 @@ static bool ufshcd_wb_presrv_usrspc_keep_vcc_on(struct ufs_hba *hba,
QUERY_ATTR_IDN_CURR_WB_BUFF_SIZE, QUERY_ATTR_IDN_CURR_WB_BUFF_SIZE,
index, 0, &cur_buf); index, 0, &cur_buf);
if (ret) { if (ret) {
dev_err(hba->dev, "%s dCurWriteBoosterBufferSize read failed %d\n", dev_err(hba->dev, "%s: dCurWriteBoosterBufferSize read failed %d\n",
__func__, ret); __func__, ret);
return false; return false;
} }
@@ -5988,7 +5987,7 @@ static bool ufshcd_wb_need_flush(struct ufs_hba *hba)
QUERY_ATTR_IDN_AVAIL_WB_BUFF_SIZE, QUERY_ATTR_IDN_AVAIL_WB_BUFF_SIZE,
index, 0, &avail_buf); index, 0, &avail_buf);
if (ret) { if (ret) {
dev_warn(hba->dev, "%s dAvailableWriteBoosterBufferSize read failed %d\n", dev_warn(hba->dev, "%s: dAvailableWriteBoosterBufferSize read failed %d\n",
__func__, ret); __func__, ret);
return false; return false;
} }