Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'ionic-cleanups' into main
Shannon Nelson says:
====================
ionic: three little changes
These are three little changes for the code from inspection
and testing.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
+6
-6
+1
drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
+1
drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
···
409
409
timer_shutdown_sync(&ionic->watchdog_timer);
410
410
411
411
if (ionic->lif) {
412
+
cancel_work_sync(&ionic->lif->deferred.work);
412
413
/* prevent adminq cmds if already known as down */
413
414
if (test_and_clear_bit(IONIC_LIF_F_FW_RESET, ionic->lif->state))
414
415
set_bit(IONIC_LIF_F_FW_STOPPING, ionic->lif->state);
+2
-2
drivers/net/ethernet/pensando/ionic/ionic_dev.c
+2
-2
drivers/net/ethernet/pensando/ionic/ionic_dev.c
···
424
424
if (fw_hb_ready != idev->fw_hb_ready) {
425
425
idev->fw_hb_ready = fw_hb_ready;
426
426
if (!fw_hb_ready)
427
-
dev_info(ionic->dev, "FW heartbeat stalled at %d\n", fw_hb);
427
+
dev_info(ionic->dev, "FW heartbeat stalled at %u\n", fw_hb);
428
428
else
429
-
dev_info(ionic->dev, "FW heartbeat restored at %d\n", fw_hb);
429
+
dev_info(ionic->dev, "FW heartbeat restored at %u\n", fw_hb);
430
430
}
431
431
432
432
if (!fw_hb_ready)
+3
-4
drivers/net/ethernet/pensando/ionic/ionic_lif.c
+3
-4
drivers/net/ethernet/pensando/ionic/ionic_lif.c
···
3526
3526
lif->info = NULL;
3527
3527
lif->info_pa = 0;
3528
3528
3529
-
/* unmap doorbell page */
3530
-
ionic_bus_unmap_dbpage(lif->ionic, lif->kern_dbpage);
3531
-
lif->kern_dbpage = NULL;
3532
-
3533
3529
mutex_destroy(&lif->config_lock);
3534
3530
mutex_destroy(&lif->queue_lock);
3535
3531
···
3550
3554
napi_disable(&lif->adminqcq->napi);
3551
3555
ionic_lif_qcq_deinit(lif, lif->notifyqcq);
3552
3556
ionic_lif_qcq_deinit(lif, lif->adminqcq);
3557
+
3558
+
ionic_bus_unmap_dbpage(lif->ionic, lif->kern_dbpage);
3559
+
lif->kern_dbpage = NULL;
3553
3560
3554
3561
ionic_lif_reset(lif);
3555
3562
}