misc: rtsx: Remove deadcode

The last uses of rtsx_ms_power_off_card3v3() and
rtsx_sd_power_off_card3v3() were removed by 2019's
commit bede03a579b3 ("misc: rtsx: Enable OCP for rts522a rts524a rts525a
rts5260")

The last use of rtsx_pci_transfer_data() was removed by 2024's
commit d0f459259c13 ("memstick: rtsx_pci_ms: Remove Realtek PCI memstick
driver")

Remove them.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Link: https://lore.kernel.org/r/20250420145739.58337-1-linux@treblig.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c
index be3d4e0e50ccd60cae77f983776fccc8e2a566a3..a7b066c487400fc7f7d44c5225522edfee1a95e3 100644 (file)
--- a/drivers/misc/cardreader/rtsx_pcr.c
+++ b/drivers/misc/cardreader/rtsx_pcr.c
@@ -420,25 +420,6 @@ static void rtsx_pci_add_sg_tbl(struct rtsx_pcr *pcr,
        pcr->sgi++;
 }
 
-int rtsx_pci_transfer_data(struct rtsx_pcr *pcr, struct scatterlist *sglist,
-               int num_sg, bool read, int timeout)
-{
-       int err = 0, count;
-
-       pcr_dbg(pcr, "--> %s: num_sg = %d\n", __func__, num_sg);
-       count = rtsx_pci_dma_map_sg(pcr, sglist, num_sg, read);
-       if (count < 1)
-               return -EINVAL;
-       pcr_dbg(pcr, "DMA mapping count: %d\n", count);
-
-       err = rtsx_pci_dma_transfer(pcr, sglist, count, read, timeout);
-
-       rtsx_pci_dma_unmap_sg(pcr, sglist, num_sg, read);
-
-       return err;
-}
-EXPORT_SYMBOL_GPL(rtsx_pci_transfer_data);
-
 int rtsx_pci_dma_map_sg(struct rtsx_pcr *pcr, struct scatterlist *sglist,
                int num_sg, bool read)
 {
@@ -1197,33 +1178,6 @@ void rtsx_pci_disable_oobs_polling(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);
-       rtsx_pci_write_register(pcr, CARD_OE, SD_OUTPUT_EN, 0);
-       rtsx_pci_card_power_off(pcr, RTSX_SD_CARD);
-
-       msleep(50);
-
-       rtsx_pci_card_pull_ctl_disable(pcr, RTSX_SD_CARD);
-
-       return 0;
-}
-
-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);
-
-       rtsx_pci_card_pull_ctl_disable(pcr, RTSX_MS_CARD);
-
-       rtsx_pci_write_register(pcr, CARD_OE, MS_OUTPUT_EN, 0);
-       rtsx_pci_card_power_off(pcr, RTSX_MS_CARD);
-
-       return 0;
-}
-
 static int rtsx_pci_init_hw(struct rtsx_pcr *pcr)
 {
        struct pci_dev *pdev = pcr->pci;

diff --git a/drivers/misc/cardreader/rtsx_pcr.h b/drivers/misc/cardreader/rtsx_pcr.h
index 9215d66de00cc06c1985bb96823467c4d627087c..8e5951b6114353cbbb7d9a384f391bf742c21709 100644 (file)
--- a/drivers/misc/cardreader/rtsx_pcr.h
+++ b/drivers/misc/cardreader/rtsx_pcr.h
@@ -127,7 +127,5 @@ int rtsx_pci_get_ocpstat(struct rtsx_pcr *pcr, u8 *val);
 void rtsx_pci_clear_ocpstat(struct rtsx_pcr *pcr);
 void rtsx_pci_enable_oobs_polling(struct rtsx_pcr *pcr);
 void rtsx_pci_disable_oobs_polling(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

diff --git a/include/linux/rtsx_pci.h b/include/linux/rtsx_pci.h
index 4612ef09a0c760bd303368a0fe4ad21c1f52e02e..3b4c36705a9b7ee365c62ee369cd4e8256785c84 100644 (file)
--- a/include/linux/rtsx_pci.h
+++ b/include/linux/rtsx_pci.h
@@ -1312,8 +1312,6 @@ void rtsx_pci_add_cmd(struct rtsx_pcr *pcr,
                u8 cmd_type, u16 reg_addr, u8 mask, u8 data);
 void rtsx_pci_send_cmd_no_wait(struct rtsx_pcr *pcr);
 int rtsx_pci_send_cmd(struct rtsx_pcr *pcr, int timeout);
-int rtsx_pci_transfer_data(struct rtsx_pcr *pcr, struct scatterlist *sglist,
-               int num_sg, bool read, int timeout);
 int rtsx_pci_dma_map_sg(struct rtsx_pcr *pcr, struct scatterlist *sglist,
                int num_sg, bool read);
 void rtsx_pci_dma_unmap_sg(struct rtsx_pcr *pcr, struct scatterlist *sglist,