[PATCH] scsi: Drop pci_save_state() after pci_restore_state()

Lukas Wunner <[email protected]> Tue, 12 May 2026 06:24:10 +0200
Newsgroups org.kernel.vger.target-devel,org.kernel.vger.linux-scsi
Message-ID <57f8a29ee7a75f81bd0a42f3fea54f0f1d3fe4e4.1778559000.git.lukas@wunner.de>
Commit 383d89699c50 ("treewide: Drop pci_save_state() after
pci_restore_state()") sought to purge all superfluous invocations of
pci_save_state() from the tree.

Unfortunately the commit missed one invocation in the Broadcom
EFCT target driver and another one in the LPFC driver.  Drop them.

Signed-off-by: Lukas Wunner <[email protected]>
---
I've combined removal from two drivers in a single patch because
they're both Broadcom devices and this is a fairly trivial change.
But if you prefer splitting the patch in two, please let me know.

 drivers/scsi/elx/efct/efct_driver.c | 7 -------
 drivers/scsi/lpfc/lpfc_init.c       | 5 -----
 2 files changed, 12 deletions(-)

diff --git a/drivers/scsi/elx/efct/efct_driver.c b/drivers/scsi/elx/efct/efct_driver.c
index fe45009..6d4f00b 100644
--- a/drivers/scsi/elx/efct/efct_driver.c
+++ b/drivers/scsi/elx/efct/efct_driver.c
@@ -696,13 +696,6 @@
 		return PCI_ERS_RESULT_DISCONNECT;
 	}
 
-	/*
-	 * As the new kernel behavior of pci_restore_state() API call clears
-	 * device saved_state flag, need to save the restored state again.
-	 */
-
-	pci_save_state(pdev);
-
 	pci_set_master(pdev);
 
 	rc = efct_setup_msix(efct, efct->n_msix_vec);
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 968a2523..dc58085 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -15245,11 +15245,6 @@ static int lpfc_cpu_online(unsigned int cpu, struct hlist_node *node)
 	if (!hba_pci_err)
 		dev_info(&pdev->dev,
 			 "hba_pci_err was not set, recovering slot reset.\n");
-	/*
-	 * As the new kernel behavior of pci_restore_state() API call clears
-	 * device saved_state flag, need to save the restored state again.
-	 */
-	pci_save_state(pdev);
 
 	if (pdev->is_busmaster)
 		pci_set_master(pdev);
-- 
2.51.0