forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mmc: core: Let mmc_send_tuning() to take struct mmc_host* as parameter

Browse source 
To be able to use mmc_send_tuning() prior the struct mmc_card has been
allocated, let's convert it to take the struct mmc_host* as parameter
instead.

Suggested-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Dong Aisheng <b29396@freescale.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
Ulf Hansson 2014-12-05 11:31:22 +01:00
commit fe5afb13d4
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/mmc/core/mmc_ops.c
View file

@ -547,14 +547,13 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
} }
EXPORT_SYMBOL_GPL(mmc_switch); EXPORT_SYMBOL_GPL(mmc_switch);
int mmc_send_tuning(struct mmc_card *card) int mmc_send_tuning(struct mmc_host *host)
{ {
struct mmc_request mrq = {NULL}; struct mmc_request mrq = {NULL};
struct mmc_command cmd = {0}; struct mmc_command cmd = {0};
struct mmc_data data = {0}; struct mmc_data data = {0};
struct scatterlist sg; struct scatterlist sg;
struct mmc_host *mmc = card->host; struct mmc_ios *ios = &host->ios;
struct mmc_ios *ios = &mmc->ios;
const u8 *tuning_block_pattern; const u8 *tuning_block_pattern;
int size, err = 0; int size, err = 0;
u8 *data_buf; u8 *data_buf;
@ -596,7 +595,7 @@ int mmc_send_tuning(struct mmc_card *card)
data.sg_len = 1; data.sg_len = 1;
sg_init_one(&sg, data_buf, size); sg_init_one(&sg, data_buf, size);
mmc_wait_for_req(mmc, &mrq); mmc_wait_for_req(host, &mrq);
if (cmd.error) { if (cmd.error) {
err = cmd.error; err = cmd.error;

2
include/linux/mmc/core.h
View file

@ -154,7 +154,7 @@ extern void mmc_start_bkops(struct mmc_card *card, bool from_exception);
extern int __mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int, bool, extern int __mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int, bool,
bool, bool); bool, bool);
extern int mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int); extern int mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int);
extern int mmc_send_tuning(struct mmc_card *card); extern int mmc_send_tuning(struct mmc_host *host);
extern int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd); extern int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd);
#define MMC_ERASE_ARG 0x00000000 #define MMC_ERASE_ARG 0x00000000