Skip to content

Commit 37e0cf3

Browse files
Alex Elderkuba-moo
authored andcommitted
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: Alex Elder <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 8ee7ec4 commit 37e0cf3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/net/ipa/ipa_power.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ struct ipa_power {
7171
};
7272

7373
/* Initialize interconnects required for IPA operation */
74-
static int ipa_interconnect_init(struct ipa_power *power, struct device *dev,
74+
static int ipa_interconnect_init(struct ipa_power *power,
7575
const struct ipa_interconnect_data *data)
7676
{
7777
struct icc_bulk_data *interconnect;
@@ -89,7 +89,7 @@ static int ipa_interconnect_init(struct ipa_power *power, struct device *dev,
8989
interconnect++;
9090
}
9191

92-
ret = of_icc_bulk_get(dev, power->interconnect_count,
92+
ret = of_icc_bulk_get(power->dev, power->interconnect_count,
9393
power->interconnect);
9494
if (ret)
9595
return ret;
@@ -123,7 +123,7 @@ static int ipa_power_enable(struct ipa *ipa)
123123

124124
ret = clk_prepare_enable(power->core);
125125
if (ret) {
126-
dev_err(&ipa->pdev->dev, "error %d enabling core clock\n", ret);
126+
dev_err(power->dev, "error %d enabling core clock\n", ret);
127127
icc_bulk_disable(power->interconnect_count,
128128
power->interconnect);
129129
}
@@ -385,7 +385,7 @@ ipa_power_init(struct device *dev, const struct ipa_power_data *data)
385385
spin_lock_init(&power->spinlock);
386386
power->interconnect_count = data->interconnect_count;
387387

388-
ret = ipa_interconnect_init(power, dev, data->interconnect_data);
388+
ret = ipa_interconnect_init(power, data->interconnect_data);
389389
if (ret)
390390
goto err_kfree;
391391

0 commit comments

Comments
 (0)