diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-05-21 13:05:45 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-22 09:38:14 +0200 |
| commit | 709b41b56a16a5901a89dcaeb75d2233f80d9e55 (patch) | |
| tree | 69777ff0154011b5d8829874bc9ca4b6c7b22c2e | |
| parent | 05ffe36a092935bf50d573842ce62c9ad9893005 (diff) | |
| download | linux-709b41b56a16a5901a89dcaeb75d2233f80d9e55.tar.gz linux-709b41b56a16a5901a89dcaeb75d2233f80d9e55.tar.bz2 linux-709b41b56a16a5901a89dcaeb75d2233f80d9e55.zip | |
misc: rtsx: Remove unnecessary rts5249_set_aspm(), rts5260_set_aspm()
rts5249_set_aspm() and rts5260_set_aspm() do nothing more than the default
rtsx_comm_set_aspm() does, so remove them and use the default. No
functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20200521180545.1159896-7-helgaas@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/misc/cardreader/rts5249.c | 15 | ||||
| -rw-r--r-- | drivers/misc/cardreader/rts5260.c | 13 |
2 files changed, 0 insertions, 28 deletions
diff --git a/drivers/misc/cardreader/rts5249.c b/drivers/misc/cardreader/rts5249.c index d122608e9f79..6c6c9e95a29f 100644 --- a/drivers/misc/cardreader/rts5249.c +++ b/drivers/misc/cardreader/rts5249.c @@ -347,18 +347,6 @@ static int rtsx_base_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage) return rtsx_pci_send_cmd(pcr, 100); } -static void rts5249_set_aspm(struct rtsx_pcr *pcr, bool enable) -{ - if (pcr->aspm_enabled == enable) - return; - - pcie_capability_clear_and_set_word(pcr->pci, PCI_EXP_LNKCTL, - PCI_EXP_LNKCTL_ASPMC, - enable ? pcr->aspm_en : 0); - - pcr->aspm_enabled = enable; -} - static const struct pcr_ops rts5249_pcr_ops = { .fetch_vendor_settings = rtsx_base_fetch_vendor_settings, .extra_init_hw = rts5249_extra_init_hw, @@ -371,7 +359,6 @@ static const struct pcr_ops rts5249_pcr_ops = { .card_power_off = rtsx_base_card_power_off, .switch_output_voltage = rtsx_base_switch_output_voltage, .force_power_down = rtsx_base_force_power_down, - .set_aspm = rts5249_set_aspm, }; /* SD Pull Control Enable: @@ -598,7 +585,6 @@ static const struct pcr_ops rts524a_pcr_ops = { .switch_output_voltage = rtsx_base_switch_output_voltage, .force_power_down = rtsx_base_force_power_down, .set_l1off_cfg_sub_d0 = rts5250_set_l1off_cfg_sub_d0, - .set_aspm = rts5249_set_aspm, }; void rts524a_init_params(struct rtsx_pcr *pcr) @@ -714,7 +700,6 @@ static const struct pcr_ops rts525a_pcr_ops = { .switch_output_voltage = rts525a_switch_output_voltage, .force_power_down = rtsx_base_force_power_down, .set_l1off_cfg_sub_d0 = rts5250_set_l1off_cfg_sub_d0, - .set_aspm = rts5249_set_aspm, }; void rts525a_init_params(struct rtsx_pcr *pcr) diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c index 75fc67d78d7f..7a9dbb778e84 100644 --- a/drivers/misc/cardreader/rts5260.c +++ b/drivers/misc/cardreader/rts5260.c @@ -570,18 +570,6 @@ static int rts5260_extra_init_hw(struct rtsx_pcr *pcr) return 0; } -static void rts5260_set_aspm(struct rtsx_pcr *pcr, bool enable) -{ - if (pcr->aspm_enabled == enable) - return; - - pcie_capability_clear_and_set_word(pcr->pci, PCI_EXP_LNKCTL, - PCI_EXP_LNKCTL_ASPMC, - enable ? pcr->aspm : 0); - - pcr->aspm_enabled = enable; -} - static void rts5260_set_l1off_cfg_sub_d0(struct rtsx_pcr *pcr, int active) { struct rtsx_cr_option *option = &pcr->option; @@ -627,7 +615,6 @@ static const struct pcr_ops rts5260_pcr_ops = { .switch_output_voltage = rts5260_switch_output_voltage, .force_power_down = rtsx_base_force_power_down, .stop_cmd = rts5260_stop_cmd, - .set_aspm = rts5260_set_aspm, .set_l1off_cfg_sub_d0 = rts5260_set_l1off_cfg_sub_d0, .enable_ocp = rts5260_enable_ocp, .disable_ocp = rts5260_disable_ocp, |