Commit 22bf3251 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Greg Kroah-Hartman
Browse files

misc: rtsx: Remove rtsx_pci_read/write_config() wrappers 



rtsx_pci_read_config_dword() and similar wrappers around the PCI config
accessors add very little value, and they obscure the fact that often we
are accessing standard PCI registers that should be coordinated with the
PCI core.

Remove the wrappers and use the PCI config accessors directly.  No
functional change intended.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20200721212336.1159079-4-helgaas@kernel.org


[ fixed up some other instances as original patch was based on old tree - gregkh
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent df746b3f

drivers/misc/cardreader/rtl8411.c

+5 −3
Original line number Diff line number Diff line
@@ -37,10 +37,11 @@ static int rtl8411b_is_qfn48(struct rtsx_pcr *pcr) 


static void rtl8411_fetch_vendor_settings(struct rtsx_pcr *pcr)

{

	struct pci_dev *pdev = pcr->pci;

	u32 reg1 = 0;

	u8 reg3 = 0;



	rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG1, &reg1);

	pci_read_config_dword(pdev, PCR_SETTING_REG1, &reg1);

	pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg1);



	if (!rtsx_vendor_setting_valid(reg1))
@@ -52,16 +53,17 @@ static void rtl8411_fetch_vendor_settings(struct rtsx_pcr *pcr) 
	pcr->card_drive_sel &= 0x3F;

	pcr->card_drive_sel |= rtsx_reg_to_card_drive_sel(reg1);



	rtsx_pci_read_config_byte(pcr, PCR_SETTING_REG3, &reg3);

	pci_read_config_byte(pdev, PCR_SETTING_REG3, &reg3);

	pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG3, reg3);

	pcr->sd30_drive_sel_3v3 = rtl8411_reg_to_sd30_drive_sel_3v3(reg3);

}



static void rtl8411b_fetch_vendor_settings(struct rtsx_pcr *pcr)

{

	struct pci_dev *pdev = pcr->pci;

	u32 reg = 0;



	rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG1, &reg);

	pci_read_config_dword(pdev, PCR_SETTING_REG1, &reg);

	pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg);



	if (!rtsx_vendor_setting_valid(reg))

drivers/misc/cardreader/rts5209.c

+3 −2
Original line number Diff line number Diff line
@@ -23,9 +23,10 @@ static u8 rts5209_get_ic_version(struct rtsx_pcr *pcr) 


static void rts5209_fetch_vendor_settings(struct rtsx_pcr *pcr)

{

	struct pci_dev *pdev = pcr->pci;

	u32 reg;



	rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG1, &reg);

	pci_read_config_dword(pdev, PCR_SETTING_REG1, &reg);

	pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg);



	if (rts5209_vendor_setting1_valid(reg)) {
@@ -34,7 +35,7 @@ static void rts5209_fetch_vendor_settings(struct rtsx_pcr *pcr) 
		pcr->aspm_en = rts5209_reg_to_aspm(reg);

	}



	rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG2, &reg);

	pci_read_config_dword(pdev, PCR_SETTING_REG2, &reg);

	pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG2, reg);



	if (rts5209_vendor_setting2_valid(reg)) {

drivers/misc/cardreader/rts5227.c

+3 −2
Original line number Diff line number Diff line
@@ -56,9 +56,10 @@ static void rts5227_fill_driving(struct rtsx_pcr *pcr, u8 voltage) 


static void rts5227_fetch_vendor_settings(struct rtsx_pcr *pcr)

{

	struct pci_dev *pdev = pcr->pci;

	u32 reg;



	rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG1, &reg);

	pci_read_config_dword(pdev, PCR_SETTING_REG1, &reg);

	pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg);



	if (!rtsx_vendor_setting_valid(reg))
@@ -69,7 +70,7 @@ static void rts5227_fetch_vendor_settings(struct rtsx_pcr *pcr) 
	pcr->card_drive_sel &= 0x3F;

	pcr->card_drive_sel |= rtsx_reg_to_card_drive_sel(reg);



	rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG2, &reg);

	pci_read_config_dword(pdev, PCR_SETTING_REG2, &reg);

	pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG2, reg);

	pcr->sd30_drive_sel_3v3 = rtsx_reg_to_sd30_drive_sel_3v3(reg);

	if (rtsx_reg_check_reverse_socket(reg))

drivers/misc/cardreader/rts5228.c

+5 −3
Original line number Diff line number Diff line
@@ -60,9 +60,11 @@ static void rts5228_fill_driving(struct rtsx_pcr *pcr, u8 voltage) 


static void rtsx5228_fetch_vendor_settings(struct rtsx_pcr *pcr)

{

	struct pci_dev *pdev = pcr->pci;

	u32 reg;



	/* 0x724~0x727 */

	rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG1, &reg);

	pci_read_config_dword(pdev, PCR_SETTING_REG1, &reg);

	pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg);



	if (!rtsx_vendor_setting_valid(reg)) {
@@ -73,7 +75,7 @@ static void rtsx5228_fetch_vendor_settings(struct rtsx_pcr *pcr) 
	pcr->aspm_en = rtsx_reg_to_aspm(reg);



	/* 0x814~0x817 */

	rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG2, &reg);

	pci_read_config_dword(pdev, PCR_SETTING_REG2, &reg);

	pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG2, reg);



	pcr->rtd3_en = rtsx_reg_to_rtd3(reg);
@@ -380,7 +382,7 @@ static void rts5228_init_from_cfg(struct rtsx_pcr *pcr) 
	u32 lval;

	struct rtsx_cr_option *option = &pcr->option;



	rtsx_pci_read_config_dword(pcr, PCR_ASPM_SETTING_REG1, &lval);

	pci_read_config_dword(pcr->pci, PCR_ASPM_SETTING_REG1, &lval);





	if (0 == (lval & 0x0F))

drivers/misc/cardreader/rts5229.c

+3 −2
Original line number Diff line number Diff line
@@ -23,9 +23,10 @@ static u8 rts5229_get_ic_version(struct rtsx_pcr *pcr) 


static void rts5229_fetch_vendor_settings(struct rtsx_pcr *pcr)

{

	struct pci_dev *pdev = pcr->pci;

	u32 reg;



	rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG1, &reg);

	pci_read_config_dword(pdev, PCR_SETTING_REG1, &reg);

	pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg);



	if (!rtsx_vendor_setting_valid(reg))
@@ -37,7 +38,7 @@ static void rts5229_fetch_vendor_settings(struct rtsx_pcr *pcr) 
	pcr->card_drive_sel &= 0x3F;

	pcr->card_drive_sel |= rtsx_reg_to_card_drive_sel(reg);



	rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG2, &reg);

	pci_read_config_dword(pdev, PCR_SETTING_REG2, &reg);

	pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG2, reg);

	pcr->sd30_drive_sel_3v3 =

		map_sd_drive(rtsx_reg_to_sd30_drive_sel_3v3(reg));

CRA Git | Maintained and supported by SUSTech CRA and CCSE