On Tue, May 19, 2015 at 11:41:34AM +0800, Yijing Wang wrote:
> Only pcie root port or downstream port would allocate
> a pcie_link_state when call alloc_pcie_link_state() in
> pcie_aspm_init_link_state(). So when call another ASPM
> functions to configure pcie_link_state, checking
> pdev->link_state is enough, it's no need to check pcie
> port type again in these functions.
>
> Signed-off-by: Yijing Wang <wangyijing@xxxxxxxxxx>
This is excellent simplification! Applied to pci/aspm for v4.2, thanks!
> ---
> drivers/pci/pcie/aspm.c | 19 ++++---------------
> 1 files changed, 4 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
> index 8830740..16a1ffb 100644
> --- a/drivers/pci/pcie/aspm.c
> +++ b/drivers/pci/pcie/aspm.c
> @@ -675,10 +675,7 @@ void pcie_aspm_pm_state_change(struct pci_dev *pdev)
> {
> struct pcie_link_state *link = pdev->link_state;
>
> - if (aspm_disabled || !pci_is_pcie(pdev) || !link)
> - return;
> - if ((pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT) &&
> - (pci_pcie_type(pdev) != PCI_EXP_TYPE_DOWNSTREAM))
> + if (aspm_disabled || !link)
> return;
> /*
> * Devices changed PM state, we should recheck if latency
> @@ -696,16 +693,12 @@ void pcie_aspm_powersave_config_link(struct pci_dev *pdev)
> {
> struct pcie_link_state *link = pdev->link_state;
>
> - if (aspm_disabled || !pci_is_pcie(pdev) || !link)
> + if (aspm_disabled || !link)
> return;
>
> if (aspm_policy != POLICY_POWERSAVE)
> return;
>
> - if ((pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT) &&
> - (pci_pcie_type(pdev) != PCI_EXP_TYPE_DOWNSTREAM))
> - return;
> -
> down_read(&pci_bus_sem);
> mutex_lock(&aspm_lock);
> pcie_config_aspm_path(link);
> @@ -906,9 +899,7 @@ void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev)
> {
> struct pcie_link_state *link_state = pdev->link_state;
>
> - if (!pci_is_pcie(pdev) ||
> - (pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT &&
> - pci_pcie_type(pdev) != PCI_EXP_TYPE_DOWNSTREAM) || !link_state)
> + if (!link_state)
> return;
>
> if (link_state->aspm_support)
> @@ -923,9 +914,7 @@ void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev)
> {
> struct pcie_link_state *link_state = pdev->link_state;
>
> - if (!pci_is_pcie(pdev) ||
> - (pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT &&
> - pci_pcie_type(pdev) != PCI_EXP_TYPE_DOWNSTREAM) || !link_state)
> + if (!link_state)
> return;
>
> if (link_state->aspm_support)
> --
> 1.7.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
