net: ipa: kill IPA_POWER_FLAG_SYSTEM

The SYSTEM IPA power flag is set, cleared, and tested.  But nothing
happens based on its value when tested, so it serves no purpose.
Get rid of this flag.

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

diff --git a/drivers/net/ipa/ipa_power.c b/drivers/net/ipa/ipa_power.c
index 694bc71e0a17018b0500296e78b25e608b28397a..be9e859e853fb706f26d1e002c7d6cc8e29e6a75 100644 (file)
--- a/drivers/net/ipa/ipa_power.c
+++ b/drivers/net/ipa/ipa_power.c
@@ -37,12 +37,10 @@
 /**
  * enum ipa_power_flag - IPA power flags
  * @IPA_POWER_FLAG_RESUMED:    Whether resume from suspend has been signaled
- * @IPA_POWER_FLAG_SYSTEM:     Hardware is system (not runtime) suspended
  * @IPA_POWER_FLAG_COUNT:      Number of defined power flags
  */
 enum ipa_power_flag {
        IPA_POWER_FLAG_RESUMED,
-       IPA_POWER_FLAG_SYSTEM,
        IPA_POWER_FLAG_COUNT,           /* Last; not a flag */
 };
 
@@ -173,8 +171,6 @@ static int ipa_suspend(struct device *dev)
 {
        struct ipa *ipa = dev_get_drvdata(dev);
 
-       __set_bit(IPA_POWER_FLAG_SYSTEM, ipa->power->flags);
-
        /* Increment the disable depth to ensure that the IRQ won't
         * be re-enabled until the matching _enable call in
         * ipa_resume(). We do this to ensure that the interrupt
@@ -196,8 +192,6 @@ static int ipa_resume(struct device *dev)
 
        ret = pm_runtime_force_resume(dev);
 
-       __clear_bit(IPA_POWER_FLAG_SYSTEM, ipa->power->flags);
-
        /* Now that PM runtime is enabled again it's safe
         * to turn the IRQ back on and process any data
         * that was received during suspend.
@@ -219,10 +213,9 @@ void ipa_power_suspend_handler(struct ipa *ipa, enum ipa_irq_id irq_id)
         * just to handle the interrupt, so we're done.  If we are in a
         * system suspend, trigger a system resume.
         */
-       if (!__test_and_set_bit(IPA_POWER_FLAG_RESUMED, ipa->power->flags))
-               if (test_bit(IPA_POWER_FLAG_SYSTEM, ipa->power->flags)) {
-                       ;
-               }
+       if (!__test_and_set_bit(IPA_POWER_FLAG_RESUMED, ipa->power->flags)) {
+               ;
+       }
 
        /* Acknowledge/clear the suspend interrupt on all endpoints */
        ipa_interrupt_suspend_clear_all(ipa->interrupt);