Commit 37e0cf33 authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski

net: ipa: use IPA power device pointer

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: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8ee7ec48
...@@ -71,7 +71,7 @@ struct ipa_power { ...@@ -71,7 +71,7 @@ struct ipa_power {
}; };
/* Initialize interconnects required for IPA operation */ /* 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) const struct ipa_interconnect_data *data)
{ {
struct icc_bulk_data *interconnect; struct icc_bulk_data *interconnect;
...@@ -89,7 +89,7 @@ static int ipa_interconnect_init(struct ipa_power *power, struct device *dev, ...@@ -89,7 +89,7 @@ static int ipa_interconnect_init(struct ipa_power *power, struct device *dev,
interconnect++; interconnect++;
} }
ret = of_icc_bulk_get(dev, power->interconnect_count, ret = of_icc_bulk_get(power->dev, power->interconnect_count,
power->interconnect); power->interconnect);
if (ret) if (ret)
return ret; return ret;
...@@ -123,7 +123,7 @@ static int ipa_power_enable(struct ipa *ipa) ...@@ -123,7 +123,7 @@ static int ipa_power_enable(struct ipa *ipa)
ret = clk_prepare_enable(power->core); ret = clk_prepare_enable(power->core);
if (ret) { 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, icc_bulk_disable(power->interconnect_count,
power->interconnect); power->interconnect);
} }
...@@ -385,7 +385,7 @@ ipa_power_init(struct device *dev, const struct ipa_power_data *data) ...@@ -385,7 +385,7 @@ ipa_power_init(struct device *dev, const struct ipa_power_data *data)
spin_lock_init(&power->spinlock); spin_lock_init(&power->spinlock);
power->interconnect_count = data->interconnect_count; 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) if (ret)
goto err_kfree; goto err_kfree;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment