Commit 709b41b5 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Greg Kroah-Hartman
Browse files

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: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20200521180545.1159896-7-helgaas@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 05ffe36a

drivers/misc/cardreader/rts5249.c

+0 −15
Original line number Diff line number Diff line
@@ -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)

drivers/misc/cardreader/rts5260.c

+0 −13
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE