提交 ac3f2784 编写于 作者: B Bjorn Andersson

soc: qcom: wcnss_ctrl: Introduce local variable "dev"

Introduce a local variable to carry the struct device *, to reduce the
line lengths in the next patch.
Tested-by: NAníbal Limón <anibal.limon@linaro.org>
Link: https://lore.kernel.org/r/20210312003318.3273536-4-bjorn.andersson@linaro.orgSigned-off-by: NBjorn Andersson <bjorn.andersson@linaro.org>
上级 f553ba15
...@@ -199,6 +199,7 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss, bool *expect_cbc) ...@@ -199,6 +199,7 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss, bool *expect_cbc)
{ {
struct wcnss_download_nv_req *req; struct wcnss_download_nv_req *req;
const struct firmware *fw; const struct firmware *fw;
struct device *dev = wcnss->dev;
const void *data; const void *data;
ssize_t left; ssize_t left;
int ret; int ret;
...@@ -207,9 +208,9 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss, bool *expect_cbc) ...@@ -207,9 +208,9 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss, bool *expect_cbc)
if (!req) if (!req)
return -ENOMEM; return -ENOMEM;
ret = request_firmware(&fw, NVBIN_FILE, wcnss->dev); ret = request_firmware(&fw, NVBIN_FILE, dev);
if (ret < 0) { if (ret < 0) {
dev_err(wcnss->dev, "Failed to load nv file %s: %d\n", dev_err(dev, "Failed to load nv file %s: %d\n",
NVBIN_FILE, ret); NVBIN_FILE, ret);
goto free_req; goto free_req;
} }
...@@ -235,7 +236,7 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss, bool *expect_cbc) ...@@ -235,7 +236,7 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss, bool *expect_cbc)
ret = rpmsg_send(wcnss->channel, req, req->hdr.len); ret = rpmsg_send(wcnss->channel, req, req->hdr.len);
if (ret < 0) { if (ret < 0) {
dev_err(wcnss->dev, "failed to send smd packet\n"); dev_err(dev, "failed to send smd packet\n");
goto release_fw; goto release_fw;
} }
...@@ -248,7 +249,7 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss, bool *expect_cbc) ...@@ -248,7 +249,7 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss, bool *expect_cbc)
ret = wait_for_completion_timeout(&wcnss->ack, WCNSS_REQUEST_TIMEOUT); ret = wait_for_completion_timeout(&wcnss->ack, WCNSS_REQUEST_TIMEOUT);
if (!ret) { if (!ret) {
dev_err(wcnss->dev, "timeout waiting for nv upload ack\n"); dev_err(dev, "timeout waiting for nv upload ack\n");
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
} else { } else {
*expect_cbc = wcnss->ack_status == WCNSS_ACK_COLD_BOOTING; *expect_cbc = wcnss->ack_status == WCNSS_ACK_COLD_BOOTING;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册