2018-12-09 23:47:14

by Frederick Lawler

Subject: [PATCH] PCI/ASPM: Remove unused lists from struct pcie_link_state

ASPM does not make use of the children or link LIST_HEADs declared in
struct pcie_link_state and defined in alloc_pcie_link_state(). Therefore,
remove these lists.

No functional change intended.

Signed-off-by: Frederick Lawler <[email protected]>
---
drivers/pci/pcie/aspm.c | 6 ------
1 file changed, 6 deletions(-)

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index dcb29cb76dc6..2330ebf6df72 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -53,8 +53,6 @@ struct pcie_link_state {
struct pcie_link_state *root; /* pointer to the root port link */
struct pcie_link_state *parent; /* pointer to the parent Link state */
struct list_head sibling; /* node in link_list */
- struct list_head children; /* list of child link states */
- struct list_head link; /* node in parent's children list */

/* ASPM state */
u32 aspm_support:7; /* Supported ASPM state */
@@ -850,8 +848,6 @@ static struct pcie_link_state *alloc_pcie_link_state(struct pci_dev *pdev)
return NULL;

INIT_LIST_HEAD(&link->sibling);
- INIT_LIST_HEAD(&link->children);
- INIT_LIST_HEAD(&link->link);
link->pdev = pdev;
link->downstream = pci_function_0(pdev->subordinate);

@@ -877,7 +873,6 @@ static struct pcie_link_state *alloc_pcie_link_state(struct pci_dev *pdev)

link->parent = parent;
link->root = link->parent->root;
- list_add(&link->link, &parent->children);
}

list_add(&link->sibling, &link_list);
@@ -1001,7 +996,6 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)
/* All functions are removed, so just disable ASPM for the link */
pcie_config_aspm_link(link, 0);
list_del(&link->sibling);
- list_del(&link->link);
/* Clock PM is for endpoint device */
free_link_state(link);

--
2.17.1

2018-12-17 23:20:48

by Bjorn Helgaas

Subject: Re: [PATCH] PCI/ASPM: Remove unused lists from struct pcie_link_state

On Sun, Dec 09, 2018 at 04:45:50PM -0600, Frederick Lawler wrote:
> ASPM does not make use of the children or link LIST_HEADs declared in
> struct pcie_link_state and defined in alloc_pcie_link_state(). Therefore,
> remove these lists.
>
> No functional change intended.
>
> Signed-off-by: Frederick Lawler <[email protected]>

Applied to pci/aspm for v4.21, thanks, Fred!

> ---
> drivers/pci/pcie/aspm.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
> index dcb29cb76dc6..2330ebf6df72 100644
> --- a/drivers/pci/pcie/aspm.c
> +++ b/drivers/pci/pcie/aspm.c
> @@ -53,8 +53,6 @@ struct pcie_link_state {
> struct pcie_link_state *root; /* pointer to the root port link */
> struct pcie_link_state *parent; /* pointer to the parent Link state */
> struct list_head sibling; /* node in link_list */
> - struct list_head children; /* list of child link states */
> - struct list_head link; /* node in parent's children list */
>
> /* ASPM state */
> u32 aspm_support:7; /* Supported ASPM state */
> @@ -850,8 +848,6 @@ static struct pcie_link_state *alloc_pcie_link_state(struct pci_dev *pdev)
> return NULL;
>
> INIT_LIST_HEAD(&link->sibling);
> - INIT_LIST_HEAD(&link->children);
> - INIT_LIST_HEAD(&link->link);
> link->pdev = pdev;
> link->downstream = pci_function_0(pdev->subordinate);
>
> @@ -877,7 +873,6 @@ static struct pcie_link_state *alloc_pcie_link_state(struct pci_dev *pdev)
>
> link->parent = parent;
> link->root = link->parent->root;
> - list_add(&link->link, &parent->children);
> }
>
> list_add(&link->sibling, &link_list);
> @@ -1001,7 +996,6 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)
> /* All functions are removed, so just disable ASPM for the link */
> pcie_config_aspm_link(link, 0);
> list_del(&link->sibling);
> - list_del(&link->link);
> /* Clock PM is for endpoint device */
> free_link_state(link);
>
> --
> 2.17.1
>