Commit 51bd7125 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Lee Jones
Browse files

misc: rtsx: Fix symbol clashes 



drivers/staging/rts5208/sd.o: In function `.sd_power_off_card3v3':
(.text+0x5760): multiple definition of `.sd_power_off_card3v3'
drivers/misc/cardreader/rtsx_pcr.o:(.text+0x4630): first defined here
drivers/staging/rts5208/sd.o:(.opd+0x378): multiple definition of `sd_power_off_card3v3'
drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x4f8): first defined here
drivers/staging/rts5208/ms.o: In function `.ms_power_off_card3v3':
(.text+0x5e70): multiple definition of `.ms_power_off_card3v3'
drivers/misc/cardreader/rtsx_pcr.o:(.text+0x46e0): first defined here
drivers/staging/rts5208/ms.o:(.opd+0x360): multiple definition of `ms_power_off_card3v3'
drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x510): first defined here

Fixes: 5da4e04a ("misc: rtsx: Add support for RTS5260")
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 5da4e04a

drivers/misc/cardreader/rts5260.c

+2 −2
Original line number Diff line number Diff line
@@ -426,9 +426,9 @@ void rts5260_process_ocp(struct rtsx_pcr *pcr) 
	rtsx_pci_get_ocpstat(pcr, &pcr->ocp_stat);

	rts5260_get_ocpstat2(pcr, &pcr->ocp_stat2);

	if (pcr->card_exist & SD_EXIST)

		sd_power_off_card3v3(pcr);

		rtsx_sd_power_off_card3v3(pcr);

	else if (pcr->card_exist & MS_EXIST)

		ms_power_off_card3v3(pcr);

		rtsx_ms_power_off_card3v3(pcr);



	if (!(pcr->card_exist & MS_EXIST) && !(pcr->card_exist & SD_EXIST)) {

		if ((pcr->ocp_stat & (SD_OC_NOW | SD_OC_EVER |

drivers/misc/cardreader/rtsx_pcr.c

+2 −2
Original line number Diff line number Diff line
@@ -1208,7 +1208,7 @@ void rtsx_pci_clear_ocpstat(struct rtsx_pcr *pcr) 
	}

}



int sd_power_off_card3v3(struct rtsx_pcr *pcr)

int rtsx_sd_power_off_card3v3(struct rtsx_pcr *pcr)

{

	rtsx_pci_write_register(pcr, CARD_CLK_EN, SD_CLK_EN |

		MS_CLK_EN | SD40_CLK_EN, 0);
@@ -1223,7 +1223,7 @@ int sd_power_off_card3v3(struct rtsx_pcr *pcr) 
	return 0;

}



int ms_power_off_card3v3(struct rtsx_pcr *pcr)

int rtsx_ms_power_off_card3v3(struct rtsx_pcr *pcr)

{

	rtsx_pci_write_register(pcr, CARD_CLK_EN, SD_CLK_EN |

		MS_CLK_EN | SD40_CLK_EN, 0);

drivers/misc/cardreader/rtsx_pcr.h

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ void rtsx_pci_disable_ocp(struct rtsx_pcr *pcr); 
void rtsx_pci_enable_ocp(struct rtsx_pcr *pcr);

int rtsx_pci_get_ocpstat(struct rtsx_pcr *pcr, u8 *val);

void rtsx_pci_clear_ocpstat(struct rtsx_pcr *pcr);

int sd_power_off_card3v3(struct rtsx_pcr *pcr);

int ms_power_off_card3v3(struct rtsx_pcr *pcr);

int rtsx_sd_power_off_card3v3(struct rtsx_pcr *pcr);

int rtsx_ms_power_off_card3v3(struct rtsx_pcr *pcr);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE