On Fri, Dec 05, 2014 at 11:41:23AM +0100, Ulf Hansson wrote: > 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 <[email protected]> > Signed-off-by: Ulf Hansson <[email protected]>
Acked-by: Dong Aisheng <[email protected]> Regards Dong Aisheng > --- > drivers/mmc/core/mmc_ops.c | 7 +++---- > include/linux/mmc/core.h | 2 +- > 2 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c > index 12b2a32..3b044c5 100644 > --- a/drivers/mmc/core/mmc_ops.c > +++ b/drivers/mmc/core/mmc_ops.c > @@ -547,14 +547,13 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, > u8 value, > } > 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_command cmd = {0}; > struct mmc_data data = {0}; > struct scatterlist sg; > - struct mmc_host *mmc = card->host; > - struct mmc_ios *ios = &mmc->ios; > + struct mmc_ios *ios = &host->ios; > const u8 *tuning_block_pattern; > int size, err = 0; > u8 *data_buf; > @@ -596,7 +595,7 @@ int mmc_send_tuning(struct mmc_card *card) > data.sg_len = 1; > sg_init_one(&sg, data_buf, size); > > - mmc_wait_for_req(mmc, &mrq); > + mmc_wait_for_req(host, &mrq); > > if (cmd.error) { > err = cmd.error; > diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h > index c4bdaa1..cb2b040 100644 > --- a/include/linux/mmc/core.h > +++ b/include/linux/mmc/core.h > @@ -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, > bool, bool); > 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); > > #define MMC_ERASE_ARG 0x00000000 > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
