Re: [PATCH v11 05/16] PCI/ERR: Rename reset_link() to reset_subordinates()

[Kuppuswamy, Sathyanarayanan]

Hi,

On 11/17/20 11:19 AM, Sean V Kelley wrote:
> reset_link() appears to be misnamed.  The point is to reset any devices
> below a given bridge, so rename it to reset_subordinates() to make it clear
> that we are passing a bridge with the intent to reset the devices below it.
>
> [bhelgaas: fix reset_subordinate_device() typo, shorten name]
> Suggested-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> Link: https://lore.kernel.org/r/20201002184735.1229220-5-seanvk.dev@xxxxxxxxxxxxxxxx
> Signed-off-by: Sean V Kelley <sean.v.kelley@xxxxxxxxx>
> Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> Acked-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@xxxxxxxxxxxxxxx>
> ---
>   drivers/pci/pci.h      | 4 ++--
>   drivers/pci/pcie/err.c | 8 ++++----
>   2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
> index 12dcad8f3635..3c4570a3058f 100644
> --- a/drivers/pci/pci.h
> +++ b/drivers/pci/pci.h
> @@ -572,8 +572,8 @@ static inline int pci_dev_specific_disable_acs_redir(struct pci_dev *dev)
>   
>   /* PCI error reporting and recovery */
>   pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
> -			pci_channel_state_t state,
> -			pci_ers_result_t (*reset_link)(struct pci_dev *pdev));
> +		pci_channel_state_t state,
> +		pci_ers_result_t (*reset_subordinates)(struct pci_dev *pdev));
>   
>   bool pcie_wait_for_link(struct pci_dev *pdev, bool active);
>   #ifdef CONFIG_PCIEASPM
> diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c
> index c543f419d8f9..db149c6ce4fb 100644
> --- a/drivers/pci/pcie/err.c
> +++ b/drivers/pci/pcie/err.c
> @@ -147,8 +147,8 @@ static int report_resume(struct pci_dev *dev, void *data)
>   }
>   
>   pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
> -			pci_channel_state_t state,
> -			pci_ers_result_t (*reset_link)(struct pci_dev *pdev))
> +		pci_channel_state_t state,
> +		pci_ers_result_t (*reset_subordinates)(struct pci_dev *pdev))
>   {
>   	pci_ers_result_t status = PCI_ERS_RESULT_CAN_RECOVER;
>   	struct pci_bus *bus;
> @@ -165,9 +165,9 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
>   	pci_dbg(dev, "broadcast error_detected message\n");
>   	if (state == pci_channel_io_frozen) {
>   		pci_walk_bus(bus, report_frozen_detected, &status);
> -		status = reset_link(dev);
> +		status = reset_subordinates(dev);
>   		if (status != PCI_ERS_RESULT_RECOVERED) {
> -			pci_warn(dev, "link reset failed\n");
> +			pci_warn(dev, "subordinate device reset failed\n");
>   			goto failed;
>   		}
>   	} else {

--
Sathyanarayanan Kuppuswamy
Linux Kernel Developer