From a4f48458ca1c02eeedf914ef6a892e047d6b65cc Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Fri, 15 May 2020 15:07:30 -0500 Subject: [PATCH] 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 Signed-off-by: David S. Miller --- drivers/net/ipa/ipa_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c index e0b1fe3..76d5108 100644 --- 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 = { -- 2.7.4