Commit c9b929ed authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Ulf Hansson
Browse files

mmc: tmio: remove useless TMIO_MASK_CMD handling in tmio_mmc_host_probe() 



TMIO_MASK_CMD is properly enabled in tmio_mmc_start_command().

We have no reason to set it up in tmio_mmc_host_probe().  (If we
really wanted to set it in the probe, we would have to do likewise
when resuming.)

Even worse, the following code is extremely confusing:

  _host->sdcard_irq_mask &= ~irq_mask;

The logic is opposite between "->sdcard_irq_mask" and "irq_mask".
The intention is not clear at a glance.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 9b3ab55d

drivers/mmc/host/tmio_mmc_core.c

+0 −3
Original line number Diff line number Diff line
@@ -1195,7 +1195,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) 
	struct tmio_mmc_data *pdata = _host->pdata;

	struct mmc_host *mmc = _host->mmc;

	int ret;

	u32 irq_mask = TMIO_MASK_CMD;



	/*

	 * Check the sanity of mmc->f_min to prevent tmio_mmc_set_clock() from
@@ -1277,8 +1276,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) 
	_host->sdcard_irq_mask = sd_ctrl_read16_and_16_as_32(_host, CTL_IRQ_MASK);

	tmio_mmc_disable_mmc_irqs(_host, TMIO_MASK_ALL);



	_host->sdcard_irq_mask &= ~irq_mask;



	if (_host->native_hotplug)

		tmio_mmc_enable_mmc_irqs(_host,

				TMIO_STAT_CARD_REMOVE | TMIO_STAT_CARD_INSERT);