diff mbox series

ide: remove unnecessary touch_softlockup_watchdog

Message ID 20190926131344.12709-1-guoqing.jiang@cloud.ionos.com
State Accepted
Delegated to: David Miller
Headers show
Series ide: remove unnecessary touch_softlockup_watchdog | expand

Commit Message

Guoqing Jiang Sept. 26, 2019, 1:13 p.m. UTC 
From: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>

Call touch_softlockup_watchdog before touch_nmi_watchdog is not needed,
since touch_softlockup_watchdog is called inside touch_nmi_watchdog.

Signed-off-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
---
 drivers/ide/ide-iops.c | 1 -
 1 file changed, 1 deletion(-)

Comments

David Miller Jan. 20, 2020, 1:39 p.m. UTC | #1 
From: jgq516@gmail.com
Date: Thu, 26 Sep 2019 15:13:44 +0200

> From: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
> 
> Call touch_softlockup_watchdog before touch_nmi_watchdog is not needed,
> since touch_softlockup_watchdog is called inside touch_nmi_watchdog.
> 
> Signed-off-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>

Applied.
diff mbox series

Patch

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index d1445d74e9c3..f2be127ee96e 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -530,7 +530,6 @@  int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout)
 		 */
 		if (stat == 0xff)
 			return -ENODEV;
-		touch_softlockup_watchdog();
 		touch_nmi_watchdog();
 	}
 	return -EBUSY;