Skip to content

Commit cc4a7a2

Browse files
l1kbjorn-helgaas
authored andcommitted
PCI/ERR: Remove remnants of .link_reset() callback
Back in 2017, commit 2fd260f ("PCI/AER: Remove unused .link_reset() callback") removed .link_reset() from struct pci_error_handlers, but left a few code comments behind which still mention it. Remove them. The code comments in the SolarFlare Ethernet drivers point out that no .mmio_enabled() callback is needed because the driver's .error_detected() callback always returns PCI_ERS_RESULT_NEED_RESET, which causes pcie_do_recovery() to skip .mmio_enabled(). That's not quite correct because efx_io_error_detected() does return PCI_ERS_RESULT_RECOVERED under certain conditions and then .mmio_enabled() would indeed be called if it were implemented. Remove this misleading portion of the code comment as well. Signed-off-by: Lukas Wunner <lukas@wunner.de> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Link: https://patch.msgid.link/1d72a891a7f57115e78a73046e776f7e0c8cd68f.1755008151.git.lukas@wunner.de
1 parent 45bc825 commit cc4a7a2

File tree

4 files changed

+1
-10
lines changed

4 files changed

+1
-10
lines changed

drivers/net/ethernet/sfc/efx_common.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,9 +1258,6 @@ static void efx_io_resume(struct pci_dev *pdev)
12581258

12591259
/* For simplicity and reliability, we always require a slot reset and try to
12601260
* reset the hardware when a pci error affecting the device is detected.
1261-
* We leave both the link_reset and mmio_enabled callback unimplemented:
1262-
* with our request for slot reset the mmio_enabled callback will never be
1263-
* called, and the link_reset callback is not used by AER or EEH mechanisms.
12641261
*/
12651262
const struct pci_error_handlers efx_err_handlers = {
12661263
.error_detected = efx_io_error_detected,

drivers/net/ethernet/sfc/falcon/efx.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3128,9 +3128,6 @@ static void ef4_io_resume(struct pci_dev *pdev)
31283128

31293129
/* For simplicity and reliability, we always require a slot reset and try to
31303130
* reset the hardware when a pci error affecting the device is detected.
3131-
* We leave both the link_reset and mmio_enabled callback unimplemented:
3132-
* with our request for slot reset the mmio_enabled callback will never be
3133-
* called, and the link_reset callback is not used by AER or EEH mechanisms.
31343131
*/
31353132
static const struct pci_error_handlers ef4_err_handlers = {
31363133
.error_detected = ef4_io_error_detected,

drivers/net/ethernet/sfc/siena/efx_common.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,9 +1285,6 @@ static void efx_io_resume(struct pci_dev *pdev)
12851285

12861286
/* For simplicity and reliability, we always require a slot reset and try to
12871287
* reset the hardware when a pci error affecting the device is detected.
1288-
* We leave both the link_reset and mmio_enabled callback unimplemented:
1289-
* with our request for slot reset the mmio_enabled callback will never be
1290-
* called, and the link_reset callback is not used by AER or EEH mechanisms.
12911288
*/
12921289
const struct pci_error_handlers efx_siena_err_handlers = {
12931290
.error_detected = efx_io_error_detected,

drivers/scsi/lpfc/lpfc_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14377,7 +14377,7 @@ lpfc_sli_prep_dev_for_perm_failure(struct lpfc_hba *phba)
1437714377
* as desired.
1437814378
*
1437914379
* Return codes
14380-
* PCI_ERS_RESULT_CAN_RECOVER - can be recovered with reset_link
14380+
* PCI_ERS_RESULT_CAN_RECOVER - can be recovered without reset
1438114381
* PCI_ERS_RESULT_NEED_RESET - need to reset before recovery
1438214382
* PCI_ERS_RESULT_DISCONNECT - device could not be recovered
1438314383
**/

0 commit comments

Comments
 (0)