From: Georgi Djakov <georgi.djakov@linaro.org>
To: gregkh@linuxfoundation.org, linux-pm@vger.kernel.org
Cc: rjw@rjwysocki.net, robh+dt@kernel.org, mturquette@baylibre.com,
khilman@baylibre.com, vincent.guittot@linaro.org,
skannan@codeaurora.org, bjorn.andersson@linaro.org,
amit.kucheria@linaro.org, seansw@qti.qualcomm.com,
daidavid1@codeaurora.org, evgreen@chromium.org,
dianders@chromium.org, mark.rutland@arm.com,
lorenzo.pieralisi@arm.com, abailon@baylibre.com,
maxime.ripard@bootlin.com, arnd@arndb.de,
thierry.reding@gmail.com, ksitaraman@nvidia.com,
sanjayc@nvidia.com, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-arm-msm@vger.kernel.org, linux-tegra@vger.kernel.org,
georgi.djakov@linaro.org
Subject: [PATCH v11 8/8] interconnect: sdm845: Fix build failure after cmd_db API change
Date: Fri, 7 Dec 2018 17:29:17 +0200 [thread overview]
Message-ID: <20181207152917.4862-9-georgi.djakov@linaro.org> (raw)
In-Reply-To: <20181207152917.4862-1-georgi.djakov@linaro.org>
Recently the cmd_db_read_aux_data() function was changed to avoid using
memcpy and return a pointer instead. Update the code to the new API and
fix the build failure.
Fixes: ed3cafa79ea7 ("soc: qcom: cmd-db: Stop memcpy()ing in cmd_db_read_aux_data()")
Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
---
drivers/interconnect/qcom/sdm845.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/drivers/interconnect/qcom/sdm845.c b/drivers/interconnect/qcom/sdm845.c
index f594dd6f500f..06dbc99766ee 100644
--- a/drivers/interconnect/qcom/sdm845.c
+++ b/drivers/interconnect/qcom/sdm845.c
@@ -487,7 +487,9 @@ static struct qcom_icc_desc sdm845_rsc_hlos = {
static int qcom_icc_bcm_init(struct qcom_icc_bcm *bcm, struct device *dev)
{
struct qcom_icc_node *qn;
- int ret, i;
+ const struct bcm_db *data;
+ size_t data_count;
+ int i;
bcm->addr = cmd_db_read_addr(bcm->name);
if (!bcm->addr) {
@@ -496,22 +498,22 @@ static int qcom_icc_bcm_init(struct qcom_icc_bcm *bcm, struct device *dev)
return -EINVAL;
}
- if (cmd_db_read_aux_data_len(bcm->name) < sizeof(struct bcm_db)) {
+ data = cmd_db_read_aux_data(bcm->name, &data_count);
+ if (IS_ERR(data)) {
+ dev_err(dev, "%s command db read error (%ld)\n",
+ bcm->name, PTR_ERR(data));
+ return PTR_ERR(data);
+ }
+ if (!data_count) {
dev_err(dev, "%s command db missing or partial aux data\n",
bcm->name);
return -EINVAL;
}
- ret = cmd_db_read_aux_data(bcm->name, (u8 *)&bcm->aux_data,
- sizeof(struct bcm_db));
- if (ret < 0) {
- dev_err(dev, "%s command db read error (%d)\n",
- bcm->name, ret);
- return ret;
- }
-
- bcm->aux_data.unit = le32_to_cpu(bcm->aux_data.unit);
- bcm->aux_data.width = le16_to_cpu(bcm->aux_data.width);
+ bcm->aux_data.unit = le32_to_cpu(data->unit);
+ bcm->aux_data.width = le16_to_cpu(data->width);
+ bcm->aux_data.vcd = data->vcd;
+ bcm->aux_data.reserved = data->reserved;
/*
* Link Qnodes to their respective BCMs
next prev parent reply other threads:[~2018-12-07 15:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-07 15:29 [PATCH v11 0/8] Introduce on-chip interconnect API Georgi Djakov
2018-12-07 15:29 ` [PATCH v11 1/8] interconnect: Add generic " Georgi Djakov
2018-12-07 15:29 ` [PATCH v11 2/8] dt-bindings: Introduce interconnect binding Georgi Djakov
2018-12-07 15:29 ` [PATCH v11 3/8] interconnect: Allow endpoints translation via DT Georgi Djakov
2018-12-07 15:29 ` [PATCH v11 4/8] interconnect: Add debugfs support Georgi Djakov
2018-12-07 15:29 ` [PATCH v11 5/8] interconnect: qcom: Add sdm845 interconnect provider driver Georgi Djakov
2018-12-07 23:30 ` Matthias Kaehlcke
2018-12-08 0:24 ` Georgi Djakov
2018-12-07 15:29 ` [PATCH v11 6/8] arm64: dts: sdm845: Add interconnect provider DT nodes Georgi Djakov
2018-12-07 15:29 ` [PATCH v11 7/8] MAINTAINERS: add a maintainer for the interconnect API Georgi Djakov
2018-12-07 15:29 ` Georgi Djakov [this message]
2018-12-07 16:27 ` [PATCH v11 8/8] interconnect: sdm845: Fix build failure after cmd_db API change Quentin Perret
2018-12-07 16:47 ` Georgi Djakov
2018-12-07 17:14 ` Quentin Perret
2018-12-07 21:29 ` Doug Anderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181207152917.4862-9-georgi.djakov@linaro.org \
--to=georgi.djakov@linaro.org \
--cc=abailon@baylibre.com \
--cc=amit.kucheria@linaro.org \
--cc=arnd@arndb.de \
--cc=bjorn.andersson@linaro.org \
--cc=daidavid1@codeaurora.org \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=evgreen@chromium.org \
--cc=gregkh@linuxfoundation.org \
--cc=khilman@baylibre.com \
--cc=ksitaraman@nvidia.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@bootlin.com \
--cc=mturquette@baylibre.com \
--cc=rjw@rjwysocki.net \
--cc=robh+dt@kernel.org \
--cc=sanjayc@nvidia.com \
--cc=seansw@qti.qualcomm.com \
--cc=skannan@codeaurora.org \
--cc=thierry.reding@gmail.com \
--cc=vincent.guittot@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox