Skip to content

Commit 87be989

Browse files
jacob-kellerJeff Kirsher
authored andcommitted
fm10k: prefer %s and __func__ for diagnostic prints
Don't hard code the function names in the diagnostic output when these reset related routines fail. Instead, use %s and __func__ so that future refactors don't need to change the print outs. Additionally, while we are here, add missing function header comments for the new reset_prepare and reset_done function handlers. Signed-off-by: Jacob Keller <[email protected]> Tested-by: Krishneil Singh <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
1 parent c0ad8ef commit 87be989

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

drivers/net/ethernet/intel/fm10k/fm10k_pci.c

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2588,11 +2588,18 @@ static void fm10k_io_resume(struct pci_dev *pdev)
25882588

25892589
if (err)
25902590
dev_warn(&pdev->dev,
2591-
"fm10k_io_resume failed: %d\n", err);
2591+
"%s failed: %d\n", __func__, err);
25922592
else
25932593
netif_device_attach(netdev);
25942594
}
25952595

2596+
/**
2597+
* fm10k_io_reset_prepare - called when PCI function is about to be reset
2598+
* @pdev: Pointer to PCI device
2599+
*
2600+
* This callback is called when the PCI function is about to be reset,
2601+
* allowing the device driver to prepare for it.
2602+
*/
25962603
static void fm10k_io_reset_prepare(struct pci_dev *pdev)
25972604
{
25982605
/* warn incase we have any active VF devices */
@@ -2602,14 +2609,21 @@ static void fm10k_io_reset_prepare(struct pci_dev *pdev)
26022609
fm10k_prepare_suspend(pci_get_drvdata(pdev));
26032610
}
26042611

2612+
/**
2613+
* fm10k_io_reset_done - called when PCI function has finished resetting
2614+
* @pdev: Pointer to PCI device
2615+
*
2616+
* This callback is called just after the PCI function is reset, such as via
2617+
* /sys/class/net/<enpX>/device/reset or similar.
2618+
*/
26052619
static void fm10k_io_reset_done(struct pci_dev *pdev)
26062620
{
26072621
struct fm10k_intfc *interface = pci_get_drvdata(pdev);
26082622
int err = fm10k_handle_resume(interface);
26092623

26102624
if (err) {
26112625
dev_warn(&pdev->dev,
2612-
"fm10k_io_reset_notify failed: %d\n", err);
2626+
"%s failed: %d\n", __func__, err);
26132627
netif_device_detach(interface->netdev);
26142628
}
26152629
}

0 commit comments

Comments
 (0)