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

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

mmc: tmio_mmc: remove unused sdio_irq_enabled flag 



The sdio_irq_enabled member of struct tmio_mmc_host is a left-over from the
previously removed SDIO IRQ workaround. It is no longer needed and can now
be removed too.

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

drivers/mmc/host/tmio_mmc.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,6 @@ struct tmio_mmc_host { 
	struct mmc_request      *mrq;

	struct mmc_request      *mrq;

	struct mmc_data         *data;

	struct mmc_data         *data;

	struct mmc_host         *mmc;

	struct mmc_host         *mmc;

	unsigned int		sdio_irq_enabled;





	/* Controller power state */

	/* Controller power state */

	bool			power;

	bool			power;

drivers/mmc/host/tmio_mmc_pio.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -128,7 +128,6 @@ static void tmio_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) 
	struct tmio_mmc_host *host = mmc_priv(mmc);

	struct tmio_mmc_host *host = mmc_priv(mmc);





	if (enable) {

	if (enable) {

		host->sdio_irq_enabled = 1;

		host->sdio_irq_mask = TMIO_SDIO_MASK_ALL &

		host->sdio_irq_mask = TMIO_SDIO_MASK_ALL &

					~TMIO_SDIO_STAT_IOIRQ;

					~TMIO_SDIO_STAT_IOIRQ;

		sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0001);

		sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0001);
@@ -137,7 +136,6 @@ static void tmio_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) 
		host->sdio_irq_mask = TMIO_SDIO_MASK_ALL;

		host->sdio_irq_mask = TMIO_SDIO_MASK_ALL;

		sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask);

		sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask);

		sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0000);

		sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0000);

		host->sdio_irq_enabled = 0;

	}

	}

}

}