From: Shannon Nelson <shannon.nelson@amd.com>
Date: Mon, 11 Dec 2023 18:58:02 +0000 (-0800)
Subject: ionic: use timer_shutdown_sync
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b0dbe358fbb416877d32a79a586ded50040467d6;p=users%2Fjedix%2Flinux-maple.git

ionic: use timer_shutdown_sync

When stopping the watchdog timer at remove time we should
be using the new timer_shutdown_sync to assure the timer
doesn't ever get rearmed.

Signed-off-by: Shannon Nelson <shannon.nelson@amd.com>
Reviewed-by: Brett Creeley <brett.creeley@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
index 311d9f4ef0e2..fd2135c23862 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
@@ -396,7 +396,7 @@ static void ionic_remove(struct pci_dev *pdev)
 {
 	struct ionic *ionic = pci_get_drvdata(pdev);
 
-	del_timer_sync(&ionic->watchdog_timer);
+	timer_shutdown_sync(&ionic->watchdog_timer);
 
 	if (ionic->lif) {
 		/* prevent adminq cmds if already known as down */