Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe5afb13 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

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



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: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarDong Aisheng <b29396@freescale.com>
Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent fdb409f6

drivers/mmc/core/mmc_ops.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

include/linux/mmc/core.h

+1 −1
Original line number Diff line number Diff line
@@ -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