mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 21:33:52 +00:00
PCI: Simplify pcie_capability_clear_and_set_word() to ..._clear_word()
[ Upstream commit 0fce6e5c87
]
When using pcie_capability_clear_and_set_word() but not actually *setting*
anything, use pcie_capability_clear_word() instead.
Link: https://lore.kernel.org/r/20231026121924.2164-1-ilpo.jarvinen@linux.intel.com
Link: https://lore.kernel.org/r/20231026121924.2164-2-ilpo.jarvinen@linux.intel.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
[bhelgaas: squash]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
636f0fdb36
commit
39f932d295
2 changed files with 7 additions and 7 deletions
|
@ -743,10 +743,10 @@ static void pcie_config_aspm_l1ss(struct pcie_link_state *link, u32 state)
|
||||||
* in pcie_config_aspm_link().
|
* in pcie_config_aspm_link().
|
||||||
*/
|
*/
|
||||||
if (enable_req & (ASPM_STATE_L1_1 | ASPM_STATE_L1_2)) {
|
if (enable_req & (ASPM_STATE_L1_1 | ASPM_STATE_L1_2)) {
|
||||||
pcie_capability_clear_and_set_word(child, PCI_EXP_LNKCTL,
|
pcie_capability_clear_word(child, PCI_EXP_LNKCTL,
|
||||||
PCI_EXP_LNKCTL_ASPM_L1, 0);
|
PCI_EXP_LNKCTL_ASPM_L1);
|
||||||
pcie_capability_clear_and_set_word(parent, PCI_EXP_LNKCTL,
|
pcie_capability_clear_word(parent, PCI_EXP_LNKCTL,
|
||||||
PCI_EXP_LNKCTL_ASPM_L1, 0);
|
PCI_EXP_LNKCTL_ASPM_L1);
|
||||||
}
|
}
|
||||||
|
|
||||||
val = 0;
|
val = 0;
|
||||||
|
|
|
@ -4476,9 +4476,9 @@ static void quirk_disable_root_port_attributes(struct pci_dev *pdev)
|
||||||
|
|
||||||
pci_info(root_port, "Disabling No Snoop/Relaxed Ordering Attributes to avoid PCIe Completion erratum in %s\n",
|
pci_info(root_port, "Disabling No Snoop/Relaxed Ordering Attributes to avoid PCIe Completion erratum in %s\n",
|
||||||
dev_name(&pdev->dev));
|
dev_name(&pdev->dev));
|
||||||
pcie_capability_clear_and_set_word(root_port, PCI_EXP_DEVCTL,
|
pcie_capability_clear_word(root_port, PCI_EXP_DEVCTL,
|
||||||
PCI_EXP_DEVCTL_RELAX_EN |
|
PCI_EXP_DEVCTL_RELAX_EN |
|
||||||
PCI_EXP_DEVCTL_NOSNOOP_EN, 0);
|
PCI_EXP_DEVCTL_NOSNOOP_EN);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue