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: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c
index 64112a676774328734ccc6b540d877c45b151fad..f332210ce5354e53d78f03b5c1539f23643b601e 100644 (file)
--- a/drivers/net/ipa/ipa_main.c
+++ b/drivers/net/ipa/ipa_main.c
@@ -427,14 +427,6 @@ static int ipa_config(struct ipa *ipa, const struct ipa_data *data)
 {
        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);
 
        ret = ipa_mem_config(ipa);
@@ -477,8 +469,6 @@ err_mem_deconfig:
        ipa_mem_deconfig(ipa);
 err_hardware_deconfig:
        ipa_hardware_deconfig(ipa);
-err_clock_put:
-       (void)ipa_clock_put(ipa);
 
        return ret;
 }
@@ -496,7 +486,6 @@ static void ipa_deconfig(struct ipa *ipa)
        ipa->interrupt = NULL;
        ipa_mem_deconfig(ipa);
        ipa_hardware_deconfig(ipa);
-       (void)ipa_clock_put(ipa);
 }
 
 static int ipa_firmware_load(struct device *dev)