evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scsi: ufs-qcom: skip err message for optional clk

Browse source 
Don't print err message for clocks that are optional, this
leads to unnecessary confusion about failure.

Change-Id: Ieb16f2203210963d7035447547b5779fadb17f6d
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
This commit is contained in:
Venkat Gopalakrishnan 2016-12-14 17:43:31 -08:00
parent 3162449f7d
commit ef5666862f
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/scsi/ufs/ufs-qcom.c
View file

@ -99,13 +99,10 @@ static int ufs_qcom_host_clk_get(struct device *dev,
int err = 0; int err = 0;
clk = devm_clk_get(dev, name); clk = devm_clk_get(dev, name);
if (IS_ERR(clk)) { if (IS_ERR(clk))
err = PTR_ERR(clk); err = PTR_ERR(clk);
dev_err(dev, "%s: failed to get %s err %d", else
__func__, name, err);
} else {
*clk_out = clk; *clk_out = clk;
}
return err; return err;
} }
@ -184,20 +181,29 @@ static int ufs_qcom_init_lane_clks(struct ufs_qcom_host *host)
err = ufs_qcom_host_clk_get(dev, err = ufs_qcom_host_clk_get(dev,
"rx_lane0_sync_clk", &host->rx_l0_sync_clk); "rx_lane0_sync_clk", &host->rx_l0_sync_clk);
if (err) if (err) {
dev_err(dev, "%s: failed to get rx_lane0_sync_clk, err %d",
__func__, err);
goto out; goto out;
}
err = ufs_qcom_host_clk_get(dev, err = ufs_qcom_host_clk_get(dev,
"tx_lane0_sync_clk", &host->tx_l0_sync_clk); "tx_lane0_sync_clk", &host->tx_l0_sync_clk);
if (err) if (err) {
dev_err(dev, "%s: failed to get tx_lane0_sync_clk, err %d",
__func__, err);
goto out; goto out;
}
/* In case of single lane per direction, don't read lane1 clocks */ /* In case of single lane per direction, don't read lane1 clocks */
if (host->hba->lanes_per_direction > 1) { if (host->hba->lanes_per_direction > 1) {
err = ufs_qcom_host_clk_get(dev, "rx_lane1_sync_clk", err = ufs_qcom_host_clk_get(dev, "rx_lane1_sync_clk",
&host->rx_l1_sync_clk); &host->rx_l1_sync_clk);
if (err) if (err) {
dev_err(dev, "%s: failed to get rx_lane1_sync_clk, err %d",
__func__, err);
goto out; goto out;
}
/* The tx lane1 clk could be muxed, hence keep this optional */ /* The tx lane1 clk could be muxed, hence keep this optional */
ufs_qcom_host_clk_get(dev, "tx_lane1_sync_clk", ufs_qcom_host_clk_get(dev, "tx_lane1_sync_clk",