net: ipa: call device_init_wakeup() earlier

Currently, enabling wakeup for the IPA device doesn't occur until
the setup phase of initialization (in ipa_power_setup()).

There is no need to delay doing that, however.  We can conveniently
do it during the config phase, in ipa_interrupt_config(), where we
enable power management wakeup mode for the IPA interrupt.

Moving the device_init_wakeup() out of ipa_power_setup() leaves that
function empty, so it can just be eliminated.

Similarly, rearrange all of the matching inverse calls, disabling
device wakeup in ipa_interrupt_deconfig() and removing that function
as well.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ipa/ipa_interrupt.c b/drivers/net/ipa/ipa_interrupt.c
index 2ef640f9197c79c164025439113de3d05850f5e8..245a06997055699e5dc2e29b49cb96ed91d8a1c9 100644 (file)
--- a/drivers/net/ipa/ipa_interrupt.c
+++ b/drivers/net/ipa/ipa_interrupt.c
@@ -277,17 +277,25 @@ int ipa_interrupt_config(struct ipa *ipa)
                goto err_free_bitmap;
        }
 
+       ret = device_init_wakeup(dev, true);
+       if (ret) {
+               dev_err(dev, "error %d enabling wakeup\n", ret);
+               goto err_free_irq;
+       }
+
        ret = dev_pm_set_wake_irq(dev, irq);
        if (ret) {
                dev_err(dev, "error %d registering \"ipa\" IRQ as wakeirq\n",
                        ret);
-               goto err_free_irq;
+               goto err_disable_wakeup;
        }
 
        ipa->interrupt = interrupt;
 
        return 0;
 
+err_disable_wakeup:
+       (void)device_init_wakeup(dev, false);
 err_free_irq:
        free_irq(interrupt->irq, interrupt);
 err_free_bitmap:
@@ -307,6 +315,7 @@ void ipa_interrupt_deconfig(struct ipa *ipa)
        ipa->interrupt = NULL;
 
        dev_pm_clear_wake_irq(dev);
+       (void)device_init_wakeup(dev, false);
        free_irq(interrupt->irq, interrupt);
        bitmap_free(interrupt->suspend_enabled);
 }

diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c
index 6523878c0d7f6c1aba465f44965bf9eb5710f1a1..b13a59f27106dffbc7fbf2a764de744ae5c92c44 100644 (file)
--- a/drivers/net/ipa/ipa_main.c
+++ b/drivers/net/ipa/ipa_main.c
@@ -119,10 +119,6 @@ int ipa_setup(struct ipa *ipa)
        if (ret)
                return ret;
 
-       ret = ipa_power_setup(ipa);
-       if (ret)
-               goto err_gsi_teardown;
-
        ipa_endpoint_setup(ipa);
 
        /* We need to use the AP command TX endpoint to perform other
@@ -169,8 +165,6 @@ err_command_disable:
        ipa_endpoint_disable_one(command_endpoint);
 err_endpoint_teardown:
        ipa_endpoint_teardown(ipa);
-       ipa_power_teardown(ipa);
-err_gsi_teardown:
        gsi_teardown(&ipa->gsi);
 
        return ret;
@@ -195,7 +189,6 @@ static void ipa_teardown(struct ipa *ipa)
        command_endpoint = ipa->name_map[IPA_ENDPOINT_AP_COMMAND_TX];
        ipa_endpoint_disable_one(command_endpoint);
        ipa_endpoint_teardown(ipa);
-       ipa_power_teardown(ipa);
        gsi_teardown(&ipa->gsi);
 }
 

diff --git a/drivers/net/ipa/ipa_power.c b/drivers/net/ipa/ipa_power.c
index 1a413061472d8a8c3f8af4fbbee5f725439e2559..65fd14da0f86f287301ebff043c7a104027bd0e6 100644 (file)
--- a/drivers/net/ipa/ipa_power.c
+++ b/drivers/net/ipa/ipa_power.c
@@ -232,16 +232,6 @@ void ipa_power_retention(struct ipa *ipa, bool enable)
                        ret, enable ? "en" : "dis");
 }
 
-int ipa_power_setup(struct ipa *ipa)
-{
-       return device_init_wakeup(ipa->dev, true);
-}
-
-void ipa_power_teardown(struct ipa *ipa)
-{
-       (void)device_init_wakeup(ipa->dev, false);
-}
-
 /* Initialize IPA power management */
 struct ipa_power *
 ipa_power_init(struct device *dev, const struct ipa_power_data *data)

diff --git a/drivers/net/ipa/ipa_power.h b/drivers/net/ipa/ipa_power.h
index 3ffaa0687caa8256de25c53987d7fe1aea7213ae..a83524a61c28b470316a96be60d207a271c45506 100644 (file)
--- a/drivers/net/ipa/ipa_power.h
+++ b/drivers/net/ipa/ipa_power.h
@@ -31,20 +31,6 @@ u32 ipa_core_clock_rate(struct ipa *ipa);
  */
 void ipa_power_retention(struct ipa *ipa, bool enable);
 
-/**
- * ipa_power_setup() - Set up IPA power management
- * @ipa:       IPA pointer
- *
- * Return:     0 if successful, or a negative error code
- */
-int ipa_power_setup(struct ipa *ipa);
-
-/**
- * ipa_power_teardown() - Inverse of ipa_power_setup()
- * @ipa:       IPA pointer
- */
-void ipa_power_teardown(struct ipa *ipa);
-
 /**
  * ipa_power_init() - Initialize IPA power management
  * @dev:       IPA device