Commit 510bfe58 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: tmio: remove indirection of 'execute_tuning' callback 



After all the previous refactorization, we can now populate mmc_ops
directly and don't need a layer inbetween. The NULL-pointer check and
the error printout are already done by the MMC core.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/20200820132538.24758-7-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 5b0739d7

drivers/mmc/host/renesas_sdhi_core.c

+4 −3
Original line number Diff line number Diff line
@@ -519,8 +519,9 @@ static int renesas_sdhi_select_tuning(struct tmio_mmc_host *host) 
	return 0;

}



static int renesas_sdhi_execute_tuning(struct tmio_mmc_host *host, u32 opcode)

static int renesas_sdhi_execute_tuning(struct mmc_host *mmc, u32 opcode)

{

	struct tmio_mmc_host *host = mmc_priv(mmc);

	struct renesas_sdhi *priv = host_to_priv(host);

	int i, ret;
@@ -543,7 +544,7 @@ static int renesas_sdhi_execute_tuning(struct tmio_mmc_host *host, u32 opcode) 
		/* Set sampling clock position */

		sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_TAPSET, i % priv->tap_num);



		if (mmc_send_tuning(host->mmc, opcode, NULL) == 0)

		if (mmc_send_tuning(mmc, opcode, NULL) == 0)

			set_bit(i, priv->taps);



		if (sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_SMPCMP) == 0)
@@ -942,8 +943,8 @@ int renesas_sdhi_probe(struct platform_device *pdev, 
		if (!hit)

			dev_warn(&host->pdev->dev, "Unknown clock rate for tuning\n");



		host->execute_tuning = renesas_sdhi_execute_tuning;

		host->check_retune = renesas_sdhi_check_scc_error;

		host->ops.execute_tuning = renesas_sdhi_execute_tuning;

		host->ops.prepare_hs400_tuning = renesas_sdhi_prepare_hs400_tuning;

		host->ops.hs400_downgrade = renesas_sdhi_disable_scc;

		host->ops.hs400_complete = renesas_sdhi_hs400_complete;

drivers/mmc/host/tmio_mmc.h

+0 −6
Original line number Diff line number Diff line
@@ -180,12 +180,6 @@ struct tmio_mmc_host { 
	void (*reset)(struct tmio_mmc_host *host);

	bool (*check_retune)(struct tmio_mmc_host *host);



	/*

	 * Mandatory callback for tuning to occur which is optional for SDR50

	 * and mandatory for SDR104.

	 */

	int (*execute_tuning)(struct tmio_mmc_host *host, u32 opcode);



	void (*prepare_hs400_tuning)(struct tmio_mmc_host *host);

	void (*hs400_downgrade)(struct tmio_mmc_host *host);

	void (*hs400_complete)(struct tmio_mmc_host *host);

drivers/mmc/host/tmio_mmc_core.c

+0 −17
Original line number Diff line number Diff line
@@ -712,22 +712,6 @@ static int tmio_mmc_start_data(struct tmio_mmc_host *host, 
	return 0;

}



static int tmio_mmc_execute_tuning(struct mmc_host *mmc, u32 opcode)

{

	struct tmio_mmc_host *host = mmc_priv(mmc);

	int ret;



	if (!host->execute_tuning)

		return 0;



	ret = host->execute_tuning(host, opcode);



	if (ret < 0)

		dev_warn(&host->pdev->dev, "Tuning procedure failed\n");



	return ret;

}



static void tmio_process_mrq(struct tmio_mmc_host *host,

			     struct mmc_request *mrq)

{
@@ -1001,7 +985,6 @@ static struct mmc_host_ops tmio_mmc_ops = { 
	.get_cd		= tmio_mmc_get_cd,

	.enable_sdio_irq = tmio_mmc_enable_sdio_irq,

	.multi_io_quirk	= tmio_multi_io_quirk,

	.execute_tuning = tmio_mmc_execute_tuning,

};



static int tmio_mmc_init_ocr(struct tmio_mmc_host *host)

CRA Git | Maintained and supported by SUSTech CRA and CCSE