Commit 05ffe36a authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Greg Kroah-Hartman

misc: rtsx: Simplify rtsx_comm_set_aspm()

Simplify rtsx_comm_set_aspm() and remove the now-unused
rtsx_pci_enable_aspm().

rtsx_pci_disable_aspm() is still used by rtsx_pci_init_hw().
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20200521180545.1159896-6-helgaas@kernel.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3d1e7aa8
...@@ -55,12 +55,6 @@ static const struct pci_device_id rtsx_pci_ids[] = { ...@@ -55,12 +55,6 @@ static const struct pci_device_id rtsx_pci_ids[] = {
MODULE_DEVICE_TABLE(pci, rtsx_pci_ids); MODULE_DEVICE_TABLE(pci, rtsx_pci_ids);
static inline void rtsx_pci_enable_aspm(struct rtsx_pcr *pcr)
{
pcie_capability_clear_and_set_word(pcr->pci, PCI_EXP_LNKCTL,
PCI_EXP_LNKCTL_ASPMC, pcr->aspm_en);
}
static inline void rtsx_pci_disable_aspm(struct rtsx_pcr *pcr) static inline void rtsx_pci_disable_aspm(struct rtsx_pcr *pcr)
{ {
pcie_capability_clear_and_set_word(pcr->pci, PCI_EXP_LNKCTL, pcie_capability_clear_and_set_word(pcr->pci, PCI_EXP_LNKCTL,
...@@ -93,10 +87,9 @@ static void rtsx_comm_set_aspm(struct rtsx_pcr *pcr, bool enable) ...@@ -93,10 +87,9 @@ static void rtsx_comm_set_aspm(struct rtsx_pcr *pcr, bool enable)
if (pcr->aspm_enabled == enable) if (pcr->aspm_enabled == enable)
return; return;
if (enable) pcie_capability_clear_and_set_word(pcr->pci, PCI_EXP_LNKCTL,
rtsx_pci_enable_aspm(pcr); PCI_EXP_LNKCTL_ASPMC,
else enable ? pcr->aspm_en : 0);
rtsx_pci_disable_aspm(pcr);
pcr->aspm_enabled = enable; pcr->aspm_enabled = enable;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment