net: ipa: use dev PM wakeirq handling

Replace the enable_irq_wake() call with one to dev_pm_set_wake_irq()
instead. This will let the dev PM framework automatically manage the
the wakeup capability of the ipa IRQ and ensure that userspace requests
to enable/disable wakeup for the IPA via sysfs are respected.

Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Link: https://lore.kernel.org/r/20230127202758.2913612-1-caleb.connolly@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 c19cd27ac852ec59350261f4ff1b860d98721ed2..9a1153e80a3a0bb87b76338301dc88d66ca23cee 100644 (file)
--- a/drivers/net/ipa/ipa_interrupt.c
+++ b/drivers/net/ipa/ipa_interrupt.c
@@ -22,6 +22,7 @@
 #include <linux/types.h>
 #include <linux/interrupt.h>
 #include <linux/pm_runtime.h>
+#include <linux/pm_wakeirq.h>
 
 #include "ipa.h"
 #include "ipa_reg.h"
@@ -269,9 +270,9 @@ struct ipa_interrupt *ipa_interrupt_config(struct ipa *ipa)
                goto err_kfree;
        }
 
-       ret = enable_irq_wake(irq);
+       ret = dev_pm_set_wake_irq(dev, irq);
        if (ret) {
-               dev_err(dev, "error %d enabling wakeup for \"ipa\" IRQ\n", ret);
+               dev_err(dev, "error %d registering \"ipa\" IRQ as wakeirq\n", ret);
                goto err_free_irq;
        }
 
@@ -289,11 +290,8 @@ err_kfree:
 void ipa_interrupt_deconfig(struct ipa_interrupt *interrupt)
 {
        struct device *dev = &interrupt->ipa->pdev->dev;
-       int ret;
 
-       ret = disable_irq_wake(interrupt->irq);
-       if (ret)
-               dev_err(dev, "error %d disabling \"ipa\" IRQ wakeup\n", ret);
+       dev_pm_clear_wake_irq(dev);
        free_irq(interrupt->irq, interrupt);
        kfree(interrupt);
 }