From: Seungwon Jeon <tgih.jun@samsung.com>
To: 'Stephen Rothwell' <sfr@canb.auug.org.au>,
'Fariya Fatima' <fariyaf@gmail.com>,
"'John W. Linville'" <linville@tuxdriver.com>,
'Chris Ball' <chris@printf.net>,
'Ulf Hansson' <ulf.hansson@linaro.org>,
'Jaehoon Chung' <jh80.chung@samsung.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mmc@vger.kernel.org
Subject: [PATCH] linux-next: rsi: fix using of removed stuff from mmc
Date: Tue, 22 Apr 2014 15:57:28 +0900 [thread overview]
Message-ID: <000c01cf5df8$1fecf810$5fc6e830$%jun@samsung.com> (raw)
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.jun@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
next reply other threads:[~2014-04-22 6:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-22 6:57 Seungwon Jeon [this message]
2014-04-22 8:28 ` [PATCH] linux-next: rsi: fix using of removed stuff from mmc Ulf Hansson
2014-04-22 10:53 ` Seungwon Jeon
2014-04-22 11:36 ` Ulf Hansson
2014-04-22 12:32 ` Seungwon Jeon
2014-04-22 13:05 ` Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='000c01cf5df8$1fecf810$5fc6e830$%jun@samsung.com' \
--to=tgih.jun@samsung.com \
--cc=chris@printf.net \
--cc=fariyaf@gmail.com \
--cc=jh80.chung@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=sfr@canb.auug.org.au \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox