| From a863686f8649014af31553e5d294fb6fc34a0406 Mon Sep 17 00:00:00 2001 |
| From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> |
| Date: Thu, 9 Feb 2012 22:57:14 +0100 |
| Subject: 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> |
| (cherry picked from commit 5bd99c375e141b8dd12e18c45617158f98920e57) |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| drivers/mmc/host/tmio_mmc.h | 1 - |
| drivers/mmc/host/tmio_mmc_pio.c | 2 -- |
| 2 files changed, 3 deletions(-) |
| |
| diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h |
| index edfcfd7..d857f5c 100644 |
| --- a/drivers/mmc/host/tmio_mmc.h |
| +++ b/drivers/mmc/host/tmio_mmc.h |
| @@ -47,7 +47,6 @@ struct tmio_mmc_host { |
| struct mmc_request *mrq; |
| struct mmc_data *data; |
| struct mmc_host *mmc; |
| - unsigned int sdio_irq_enabled; |
| |
| /* Controller power state */ |
| bool power; |
| diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c |
| index 4a2829c..97110ba 100644 |
| --- a/drivers/mmc/host/tmio_mmc_pio.c |
| +++ b/drivers/mmc/host/tmio_mmc_pio.c |
| @@ -127,7 +127,6 @@ static void tmio_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) |
| struct tmio_mmc_host *host = mmc_priv(mmc); |
| |
| if (enable) { |
| - host->sdio_irq_enabled = 1; |
| host->sdio_irq_mask = TMIO_SDIO_MASK_ALL & |
| ~TMIO_SDIO_STAT_IOIRQ; |
| sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0001); |
| @@ -136,7 +135,6 @@ static void tmio_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) |
| 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_TRANSACTION_CTL, 0x0000); |
| - host->sdio_irq_enabled = 0; |
| } |
| } |
| |
| -- |
| 1.7.10.2.565.gbd578b5 |
| |