net: ipa: don't use noirq suspend/resume callbacks

Use the suspend and resume callbacks rather than suspend_noirq and
resume_noirq.  With IPA v4.2, we use the CHANNEL_STOP command to
implement a suspend, and without interrupts enabled, that command
won't complete.

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 e0b1fe3c34f96ffc9daad8b3d53a695f01c561b1..76d5108b8403946cb25997d87bd8f3da8a0ff2c2 100644 (file)
--- a/drivers/net/ipa/ipa_main.c
+++ b/drivers/net/ipa/ipa_main.c
@@ -933,8 +933,8 @@ static int ipa_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops ipa_pm_ops = {
-       .suspend_noirq  = ipa_suspend,
-       .resume_noirq   = ipa_resume,
+       .suspend        = ipa_suspend,
+       .resume         = ipa_resume,
 };
 
 static struct platform_driver ipa_driver = {