Merge branch 'pci/aspm' (2caa4dc6) · Commits · 戴 / test

drivers/pci/pcie/aspm.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -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);