Commit 3a3db603 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: core: Rename ->reset() bus ops to ->hw_reset() 



The bus ops ->reset() executes a full HW reset of the card, as the calling
function mmc_hw_reset() also indicates by its name. Let's convert to follow
the similar names, for both the bus ops callback and for the corresponding
bus ops functions, as to clarify the purpose of code.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Tested-by: default avatarQuentin Schulz <quentin.schulz@bootlin.com>
Reviewed-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
parent fb09f44e

drivers/mmc/core/core.c

+3 −3
Original line number Diff line number Diff line
@@ -2435,16 +2435,16 @@ int mmc_hw_reset(struct mmc_host *host) 
		return -EINVAL;



	mmc_bus_get(host);

	if (!host->bus_ops || host->bus_dead || !host->bus_ops->reset) {

	if (!host->bus_ops || host->bus_dead || !host->bus_ops->hw_reset) {

		mmc_bus_put(host);

		return -EOPNOTSUPP;

	}



	ret = host->bus_ops->reset(host);

	ret = host->bus_ops->hw_reset(host);

	mmc_bus_put(host);



	if (ret)

		pr_warn("%s: tried to reset card, got error %d\n",

		pr_warn("%s: tried to HW reset card, got error %d\n",

			mmc_hostname(host), ret);



	return ret;

drivers/mmc/core/core.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct mmc_bus_ops { 
	int (*power_restore)(struct mmc_host *);

	int (*alive)(struct mmc_host *);

	int (*shutdown)(struct mmc_host *);

	int (*reset)(struct mmc_host *);

	int (*hw_reset)(struct mmc_host *);

};



void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops);

drivers/mmc/core/mmc.c

+2 −2
Original line number Diff line number Diff line
@@ -2125,7 +2125,7 @@ static int mmc_can_reset(struct mmc_card *card) 
	return 1;

}



static int mmc_reset(struct mmc_host *host)

static int _mmc_hw_reset(struct mmc_host *host)

{

	struct mmc_card *card = host->card;
@@ -2159,7 +2159,7 @@ static const struct mmc_bus_ops mmc_ops = { 
	.runtime_resume = mmc_runtime_resume,

	.alive = mmc_alive,

	.shutdown = mmc_shutdown,

	.reset = mmc_reset,

	.hw_reset = _mmc_hw_reset,

};



/*

drivers/mmc/core/sd.c

+2 −2
Original line number Diff line number Diff line
@@ -1222,7 +1222,7 @@ static int mmc_sd_runtime_resume(struct mmc_host *host) 
	return 0;

}



static int mmc_sd_reset(struct mmc_host *host)

static int mmc_sd_hw_reset(struct mmc_host *host)

{

	mmc_power_cycle(host, host->card->ocr);

	return mmc_sd_init_card(host, host->card->ocr, host->card);
@@ -1237,7 +1237,7 @@ static const struct mmc_bus_ops mmc_sd_ops = { 
	.resume = mmc_sd_resume,

	.alive = mmc_sd_alive,

	.shutdown = mmc_sd_suspend,

	.reset = mmc_sd_reset,

	.hw_reset = mmc_sd_hw_reset,

};



/*

drivers/mmc/core/sdio.c

+2 −2
Original line number Diff line number Diff line
@@ -1050,7 +1050,7 @@ static int mmc_sdio_runtime_resume(struct mmc_host *host) 
	return ret;

}



static int mmc_sdio_reset(struct mmc_host *host)

static int mmc_sdio_hw_reset(struct mmc_host *host)

{

	mmc_power_cycle(host, host->card->ocr);

	return mmc_sdio_power_restore(host);
@@ -1066,7 +1066,7 @@ static const struct mmc_bus_ops mmc_sdio_ops = { 
	.runtime_resume = mmc_sdio_runtime_resume,

	.power_restore = mmc_sdio_power_restore,

	.alive = mmc_sdio_alive,

	.reset = mmc_sdio_reset,

	.hw_reset = mmc_sdio_hw_reset,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE