From: Alex Elder <elder@linaro.org>
To: davem@davemloft.net, kuba@kernel.org
Cc: djakov@kernel.org, bjorn.andersson@linaro.org, mka@chromium.org,
evgreen@chromium.org, cpratapa@codeaurora.org,
avuyyuru@codeaurora.org, jponduru@codeaurora.org,
subashab@codeaurora.org, elder@kernel.org,
netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH net-next v2 7/7] net: ipa: use IPA power device pointer
Date: Wed, 9 Mar 2022 13:20:37 -0600 [thread overview]
Message-ID: <20220309192037.667879-8-elder@linaro.org> (raw)
In-Reply-To: <20220309192037.667879-1-elder@linaro.org>
The ipa_power structure contains a copy of the IPA device pointer,
so there's no need to pass it to ipa_interconnect_init(). We can
also use that pointer for an error message in ipa_power_enable().
Signed-off-by: Alex Elder <elder@linaro.org>
---
drivers/net/ipa/ipa_power.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ipa/ipa_power.c b/drivers/net/ipa/ipa_power.c
index 8a564d72799da..16ece27d14d7e 100644
--- a/drivers/net/ipa/ipa_power.c
+++ b/drivers/net/ipa/ipa_power.c
@@ -71,7 +71,7 @@ struct ipa_power {
};
/* Initialize interconnects required for IPA operation */
-static int ipa_interconnect_init(struct ipa_power *power, struct device *dev,
+static int ipa_interconnect_init(struct ipa_power *power,
const struct ipa_interconnect_data *data)
{
struct icc_bulk_data *interconnect;
@@ -89,7 +89,7 @@ static int ipa_interconnect_init(struct ipa_power *power, struct device *dev,
interconnect++;
}
- ret = of_icc_bulk_get(dev, power->interconnect_count,
+ ret = of_icc_bulk_get(power->dev, power->interconnect_count,
power->interconnect);
if (ret)
return ret;
@@ -123,7 +123,7 @@ static int ipa_power_enable(struct ipa *ipa)
ret = clk_prepare_enable(power->core);
if (ret) {
- dev_err(&ipa->pdev->dev, "error %d enabling core clock\n", ret);
+ dev_err(power->dev, "error %d enabling core clock\n", ret);
icc_bulk_disable(power->interconnect_count,
power->interconnect);
}
@@ -385,7 +385,7 @@ ipa_power_init(struct device *dev, const struct ipa_power_data *data)
spin_lock_init(&power->spinlock);
power->interconnect_count = data->interconnect_count;
- ret = ipa_interconnect_init(power, dev, data->interconnect_data);
+ ret = ipa_interconnect_init(power, data->interconnect_data);
if (ret)
goto err_kfree;
--
2.32.0
next prev parent reply other threads:[~2022-03-09 19:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-09 19:20 [PATCH net-next v2 0/7] net: ipa: use bulk interconnect interfaces Alex Elder
2022-03-09 19:20 ` [PATCH net-next v2 1/7] net: ipa: kill struct ipa_interconnect Alex Elder
2022-03-09 19:20 ` [PATCH net-next v2 2/7] net: ipa: use icc_enable() and icc_disable() Alex Elder
2022-03-09 19:20 ` [PATCH net-next v2 3/7] net: ipa: use interconnect bulk enable/disable operations Alex Elder
2022-03-09 19:20 ` [PATCH net-next v2 4/7] net: ipa: use bulk operations to set up interconnects Alex Elder
2022-03-09 19:20 ` [PATCH net-next v2 5/7] net: ipa: use bulk interconnect initialization Alex Elder
2022-03-09 19:20 ` [PATCH net-next v2 6/7] net: ipa: embed interconnect array in the power structure Alex Elder
2022-03-11 5:25 ` Jakub Kicinski
2022-03-11 13:02 ` Alex Elder
2022-03-09 19:20 ` Alex Elder [this message]
2022-03-11 5:30 ` [PATCH net-next v2 0/7] net: ipa: use bulk interconnect interfaces patchwork-bot+netdevbpf
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=20220309192037.667879-8-elder@linaro.org \
--to=elder@linaro.org \
--cc=avuyyuru@codeaurora.org \
--cc=bjorn.andersson@linaro.org \
--cc=cpratapa@codeaurora.org \
--cc=davem@davemloft.net \
--cc=djakov@kernel.org \
--cc=elder@kernel.org \
--cc=evgreen@chromium.org \
--cc=jponduru@codeaurora.org \
--cc=kuba@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mka@chromium.org \
--cc=netdev@vger.kernel.org \
--cc=subashab@codeaurora.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;
as well as URLs for NNTP newsgroup(s).