[SRU][Bionic/dell300x][PATCH 1/1] Revert "rsi: Use resume_noirq for SDIO"

[Hui Wang]

BugLink: https://bugs.launchpad.net/bugs/1940488

This reverts commit a678b251a79a7b0d9f0b04ea167c2059e3e3c841.

The reverted patch introduces a crashing on rsi wifi driver after
system resume, then the wifi and bluetooth don't work anymore. This
issue also exists in the upstream stable kernel 4.19.191 and later.

Below is the crashing log:
[  754.924185] OOM killer disabled.
[  754.924186] Freezing remaining freezable tasks ... (elapsed 0.001 seconds) done.
[  754.925446] Suspending console(s) (use no_console_suspend to debug)
[  754.926057] rsi_91x: ===> Interface DOWN <===
[  765.045355] mmc1: Controller never released inhibit bit(s).
[  765.045364] mmc1: sdhci: ============ SDHCI REGISTER DUMP ===========
[  765.045374] mmc1: sdhci: Sys addr:  0xffffffff | Version:  0x0000ffff
[  765.045381] mmc1: sdhci: Blk size:  0x0000ffff | Blk cnt:  0x0000ffff
[  765.045388] mmc1: sdhci: Argument:  0xffffffff | Trn mode: 0x0000ffff
[  765.045395] mmc1: sdhci: Present:   0xffffffff | Host ctl: 0x000000ff
[  765.045402] mmc1: sdhci: Power:     0x000000ff | Blk gap:  0x000000ff
[  765.045409] mmc1: sdhci: Wake-up:   0x000000ff | Clock:    0x0000ffff

Signed-off-by: Hui Wang <hui.wang at canonical.com>
---
 drivers/net/wireless/rsi/rsi_91x_sdio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c
index 10a93dd4d95f..544161568b04 100644
--- a/drivers/net/wireless/rsi/rsi_91x_sdio.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c
@@ -1345,7 +1345,7 @@ static int rsi_restore(struct device *dev)
 }
 static const struct dev_pm_ops rsi_pm_ops = {
 	.suspend = rsi_suspend,
-	.resume_noirq = rsi_resume,
+	.resume = rsi_resume,
 	.freeze = rsi_freeze,
 	.thaw = rsi_thaw,
 	.restore = rsi_restore,
-- 
2.25.1