leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: ipa: don't return an error from ipa_interconnect_disable()

Browse Source 
If disabling interconnects fails there's not a lot we can do.  The
only two callers of ipa_interconnect_disable() ignore the return
value, so just give the function a void return type.

Print an error message if disabling any of the interconnects is not
successful.  Return (and print) only the first error seen.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Alex Elder 2021-01-15 06:50:45 -06:00 committed by Jakub Kicinski
parent bf52e27bb3
commit ec0ef6d3c8
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/net/ipa/ipa_clock.c
View File

@ -137,36 +137,27 @@ err_memory_path_disable:
} }
/* To disable an interconnect, we just its bandwidth to 0 */ /* To disable an interconnect, we just its bandwidth to 0 */
static int ipa_interconnect_disable(struct ipa *ipa) static void ipa_interconnect_disable(struct ipa *ipa)
{ {
const struct ipa_interconnect_data *data;
struct ipa_clock *clock = ipa->clock; struct ipa_clock *clock = ipa->clock;
int result = 0;
int ret; int ret;
ret = icc_set_bw(clock->memory_path, 0, 0); ret = icc_set_bw(clock->memory_path, 0, 0);
if (ret) if (ret)
return ret; result = ret;
ret = icc_set_bw(clock->imem_path, 0, 0); ret = icc_set_bw(clock->imem_path, 0, 0);
if (ret) if (ret && !result)
goto err_memory_path_reenable; result = ret;
ret = icc_set_bw(clock->config_path, 0, 0); ret = icc_set_bw(clock->config_path, 0, 0);
if (ret) if (ret && !result)
goto err_imem_path_reenable; result = ret;
return 0; if (result)
dev_err(&ipa->pdev->dev,
err_imem_path_reenable: "error %d disabling IPA interconnects\n", ret);
data = &clock->interconnect_data[IPA_INTERCONNECT_IMEM];
(void)icc_set_bw(clock->imem_path, data->average_bandwidth,
data->peak_bandwidth);
err_memory_path_reenable:
data = &clock->interconnect_data[IPA_INTERCONNECT_MEMORY];
(void)icc_set_bw(clock->memory_path, data->average_bandwidth,
data->peak_bandwidth);
return ret;
} }
/* Turn on IPA clocks, including interconnects */ /* Turn on IPA clocks, including interconnects */
@ -189,7 +180,7 @@ static int ipa_clock_enable(struct ipa *ipa)
static void ipa_clock_disable(struct ipa *ipa) static void ipa_clock_disable(struct ipa *ipa)
{ {
clk_disable_unprepare(ipa->clock->core); clk_disable_unprepare(ipa->clock->core);
(void)ipa_interconnect_disable(ipa); ipa_interconnect_disable(ipa);
} }
/* Get an IPA clock reference, but only if the reference count is /* Get an IPA clock reference, but only if the reference count is