Commit 0f1619cf authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI/ASPM: Move pci_clear_and_set_dword() earlier 

Move pci_clear_and_set_dword() earlier in file to prepare for future patch.
No functional change intended.

Link: https://lore.kernel.org/r/20201015193039.12585-2-helgaas@kernel.org


Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 9123e3a7

drivers/pci/pcie/aspm.c

+11 −11
Original line number Diff line number Diff line
@@ -493,6 +493,17 @@ static struct pci_dev *pci_function_0(struct pci_bus *linkbus) 
	return NULL;

}



static void pci_clear_and_set_dword(struct pci_dev *pdev, int pos,

				    u32 clear, u32 set)

{

	u32 val;



	pci_read_config_dword(pdev, pos, &val);

	val &= ~clear;

	val |= set;

	pci_write_config_dword(pdev, pos, val);

}



/* Calculate L1.2 PM substate timing parameters */

static void aspm_calc_l1ss_info(struct pcie_link_state *link,

				struct aspm_register_info *upreg,
@@ -651,17 +662,6 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist) 
	}

}



static void pci_clear_and_set_dword(struct pci_dev *pdev, int pos,

				    u32 clear, u32 set)

{

	u32 val;



	pci_read_config_dword(pdev, pos, &val);

	val &= ~clear;

	val |= set;

	pci_write_config_dword(pdev, pos, val);

}



/* Configure the ASPM L1 substates */

static void pcie_config_aspm_l1ss(struct pcie_link_state *link, u32 state)

{