aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-02-09 16:57:14 -0500
committerChris Ball <cjb@laptop.org>2012-03-27 12:20:17 -0400
commit5bd99c375e141b8dd12e18c45617158f98920e57 (patch)
treedf11ef77fba6ceab27ac66ce736213446e379846
parentc391e1b9ebfe31514fa95a0cdd30c2cbc9652c89 (diff)
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: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r--drivers/mmc/host/tmio_mmc.h1
-rw-r--r--drivers/mmc/host/tmio_mmc_pio.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index edfcfd767511..d857f5c6e7d9 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -47,7 +47,6 @@ struct tmio_mmc_host {
47 struct mmc_request *mrq; 47 struct mmc_request *mrq;
48 struct mmc_data *data; 48 struct mmc_data *data;
49 struct mmc_host *mmc; 49 struct mmc_host *mmc;
50 unsigned int sdio_irq_enabled;
51 50
52 /* Controller power state */ 51 /* Controller power state */
53 bool power; 52 bool power;
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index 9f22681a37bd..950824a00717 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -128,7 +128,6 @@ static void tmio_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
128 struct tmio_mmc_host *host = mmc_priv(mmc); 128 struct tmio_mmc_host *host = mmc_priv(mmc);
129 129
130 if (enable) { 130 if (enable) {
131 host->sdio_irq_enabled = 1;
132 host->sdio_irq_mask = TMIO_SDIO_MASK_ALL & 131 host->sdio_irq_mask = TMIO_SDIO_MASK_ALL &
133 ~TMIO_SDIO_STAT_IOIRQ; 132 ~TMIO_SDIO_STAT_IOIRQ;
134 sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0001); 133 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)
137 host->sdio_irq_mask = TMIO_SDIO_MASK_ALL; 136 host->sdio_irq_mask = TMIO_SDIO_MASK_ALL;
138 sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask); 137 sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask);
139 sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0000); 138 sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0000);
140 host->sdio_irq_enabled = 0;
141 } 139 }
142} 140}
143 141