Commit e0337cc8 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Chris Ball
Browse files

mmc: tmio: don't needlessly enable interrupts during probing 



We don't have to force-enable MMC interrupts in our .probe() method,
mmc_add_host() will trigger card detection, that will enable all the
necessary interrupts.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 3bfe619d

drivers/mmc/host/tmio_mmc_pio.c

+11 −10
Original line number Original line Diff line number Diff line
@@ -951,6 +951,17 @@ int __devinit tmio_mmc_host_probe(struct tmio_mmc_host **host, 




	_host->sdcard_irq_mask = sd_ctrl_read32(_host, CTL_IRQ_MASK);

	_host->sdcard_irq_mask = sd_ctrl_read32(_host, CTL_IRQ_MASK);

	tmio_mmc_disable_mmc_irqs(_host, TMIO_MASK_ALL);

	tmio_mmc_disable_mmc_irqs(_host, TMIO_MASK_ALL);



	/* Unmask the IRQs we want to know about */

	if (!_host->chan_rx)

		irq_mask |= TMIO_MASK_READOP;

	if (!_host->chan_tx)

		irq_mask |= TMIO_MASK_WRITEOP;

	if (!_host->native_hotplug)

		irq_mask &= ~(TMIO_STAT_CARD_REMOVE | TMIO_STAT_CARD_INSERT);



	_host->sdcard_irq_mask &= ~irq_mask;



	if (pdata->flags & TMIO_MMC_SDIO_IRQ)

	if (pdata->flags & TMIO_MMC_SDIO_IRQ)

		tmio_mmc_enable_sdio_irq(mmc, 0);

		tmio_mmc_enable_sdio_irq(mmc, 0);
@@ -968,16 +979,6 @@ int __devinit tmio_mmc_host_probe(struct tmio_mmc_host **host, 




	dev_pm_qos_expose_latency_limit(&pdev->dev, 100);

	dev_pm_qos_expose_latency_limit(&pdev->dev, 100);





	/* Unmask the IRQs we want to know about */

	if (!_host->chan_rx)

		irq_mask |= TMIO_MASK_READOP;

	if (!_host->chan_tx)

		irq_mask |= TMIO_MASK_WRITEOP;

	if (!_host->native_hotplug)

		irq_mask &= ~(TMIO_STAT_CARD_REMOVE | TMIO_STAT_CARD_INSERT);



	tmio_mmc_enable_mmc_irqs(_host, irq_mask);



	if (pdata->flags & TMIO_MMC_USE_GPIO_CD) {

	if (pdata->flags & TMIO_MMC_USE_GPIO_CD) {

		ret = mmc_gpio_request_cd(mmc, pdata->cd_gpio);

		ret = mmc_gpio_request_cd(mmc, pdata->cd_gpio);

		if (ret < 0) {

		if (ret < 0) {