As commit 3957848(mmc: drop the speed mode of card's state) applies,
this change should be followed.

drivers/net/wireless/rsi/rsi_91x_sdio.c:288:20: error: 'MMC_STATE_HIGHSPEED' 
undeclared (first use in this function)
drivers/net/wireless/rsi/rsi_91x_sdio.c:299:4: error: implicit declaration of 
function 'mmc_card_set_highspeed' [-Werror=implicit-function-declaration]
drivers/net/wireless/rsi/rsi_91x_sdio.c:306:2: error: implicit declaration of 
function 'mmc_card_highspeed' [-Werror=implicit-function-declaration]

Signed-off-by: Seungwon Jeon <tgih....@samsung.com>
---
 drivers/net/wireless/rsi/rsi_91x_sdio.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c 
b/drivers/net/wireless/rsi/rsi_91x_sdio.c
index 2e39d38..46e7af4 100644
--- a/drivers/net/wireless/rsi/rsi_91x_sdio.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c
@@ -285,7 +285,6 @@ static void rsi_reset_card(struct sdio_func *pfunction)
                if (err) {
                        rsi_dbg(ERR_ZONE, "%s: CCCR speed reg read failed: 
%d\n",
                                __func__, err);
-                       card->state &= ~MMC_STATE_HIGHSPEED;
                } else {
                        err = rsi_cmd52writebyte(card,
                                                 SDIO_CCCR_SPEED,
@@ -296,14 +295,13 @@ static void rsi_reset_card(struct sdio_func *pfunction)
                                        __func__, err);
                                return;
                        }
-                       mmc_card_set_highspeed(card);
                        host->ios.timing = MMC_TIMING_SD_HS;
                        host->ops->set_ios(host, &host->ios);
                }
        }
 
        /* Set clock */
-       if (mmc_card_highspeed(card))
+       if (mmc_card_hs(card))
                clock = 50000000;
        else
                clock = card->cis.max_dtr;
-- 
1.7.0.4


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to