ionic: use timer_shutdown_sync
authorShannon Nelson <shannon.nelson@amd.com>
Mon, 11 Dec 2023 18:58:02 +0000 (10:58 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Dec 2023 12:35:55 +0000 (12:35 +0000)
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>
drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c

index 311d9f4ef0e247a750bc60e63e261512efd1c14f..fd2135c23862d2e9a1561a1e3da3fdeaa076affb 100644 (file)
@@ -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 */