Commit a3d3e759 authored by Alex Elder's avatar Alex Elder Committed by David S. Miller

net: ipa: get rid of extra clock reference

Suspending the IPA hardware is now managed by the runtime PM core
code.  The ->runtime_idle callback returns a non-zero value, so it
will never suspend except when forced.  As a result, there's no need
to take an extra "do not suspend" clock reference.
Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 63de79f0
...@@ -427,14 +427,6 @@ static int ipa_config(struct ipa *ipa, const struct ipa_data *data) ...@@ -427,14 +427,6 @@ static int ipa_config(struct ipa *ipa, const struct ipa_data *data)
{ {
int ret; int ret;
/* Get a clock reference to allow initialization. This reference
* is held after initialization completes, and won't get dropped
* unless/until a system suspend request arrives.
*/
ret = ipa_clock_get(ipa);
if (WARN_ON(ret < 0))
goto err_clock_put;
ipa_hardware_config(ipa, data); ipa_hardware_config(ipa, data);
ret = ipa_mem_config(ipa); ret = ipa_mem_config(ipa);
...@@ -477,8 +469,6 @@ static int ipa_config(struct ipa *ipa, const struct ipa_data *data) ...@@ -477,8 +469,6 @@ static int ipa_config(struct ipa *ipa, const struct ipa_data *data)
ipa_mem_deconfig(ipa); ipa_mem_deconfig(ipa);
err_hardware_deconfig: err_hardware_deconfig:
ipa_hardware_deconfig(ipa); ipa_hardware_deconfig(ipa);
err_clock_put:
(void)ipa_clock_put(ipa);
return ret; return ret;
} }
...@@ -496,7 +486,6 @@ static void ipa_deconfig(struct ipa *ipa) ...@@ -496,7 +486,6 @@ static void ipa_deconfig(struct ipa *ipa)
ipa->interrupt = NULL; ipa->interrupt = NULL;
ipa_mem_deconfig(ipa); ipa_mem_deconfig(ipa);
ipa_hardware_deconfig(ipa); ipa_hardware_deconfig(ipa);
(void)ipa_clock_put(ipa);
} }
static int ipa_firmware_load(struct device *dev) static int ipa_firmware_load(struct device *dev)
......
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