diff options
| author | Christian Lütke-Stetzkamp <christian@lkamp.de> | 2018-04-29 19:32:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-06 19:08:06 -0700 |
| commit | ec7375d1f50ef1092e1feaf9e9bf5ca3d862d7f2 (patch) | |
| tree | 97db9680940b5001b78b5d92959fa0f21b3c0ca7 /drivers/staging/mt7621-mmc | |
| parent | 23f37ef71cb27823bf30f7bf674171f643daf318 (diff) | |
| download | linux-ec7375d1f50ef1092e1feaf9e9bf5ca3d862d7f2.tar.gz linux-ec7375d1f50ef1092e1feaf9e9bf5ca3d862d7f2.tar.bz2 linux-ec7375d1f50ef1092e1feaf9e9bf5ca3d862d7f2.zip | |
staging: mt7621-mmc: Remove unused sdio irq code
Currently the code for the sdio irq is never used, because the flags
for it (MSDC_(EXT_)SDIO_IRQ) are never set. So the whole code for it
can be removed.
Signed-off-by: Christian Lütke-Stetzkamp <christian@lkamp.de>
Reviewed-by: NeilBrown <neil@brown.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/mt7621-mmc')
| -rw-r--r-- | drivers/staging/mt7621-mmc/board.h | 2 | ||||
| -rw-r--r-- | drivers/staging/mt7621-mmc/sd.c | 25 |
2 files changed, 0 insertions, 27 deletions
diff --git a/drivers/staging/mt7621-mmc/board.h b/drivers/staging/mt7621-mmc/board.h index 7e0c469a444d..a7d82f321b00 100644 --- a/drivers/staging/mt7621-mmc/board.h +++ b/drivers/staging/mt7621-mmc/board.h @@ -39,8 +39,6 @@ #define MSDC_CD_PIN_EN (1 << 0) /* card detection pin is wired */ #define MSDC_WP_PIN_EN (1 << 1) /* write protection pin is wired */ #define MSDC_RST_PIN_EN (1 << 2) /* emmc reset pin is wired */ -#define MSDC_SDIO_IRQ (1 << 3) /* use internal sdio irq (bus) */ -#define MSDC_EXT_SDIO_IRQ (1 << 4) /* use external sdio irq */ #define MSDC_REMOVABLE (1 << 5) /* removable slot */ #define MSDC_SMPL_RISING (0) diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c index 614e6a72a50a..7a6101e62891 100644 --- a/drivers/staging/mt7621-mmc/sd.c +++ b/drivers/staging/mt7621-mmc/sd.c @@ -1942,33 +1942,11 @@ static int msdc_ops_get_cd(struct mmc_host *mmc) return present; } -/* ops.enable_sdio_irq */ -static void msdc_ops_enable_sdio_irq(struct mmc_host *mmc, int enable) -{ - struct msdc_host *host = mmc_priv(mmc); - struct msdc_hw *hw = host->hw; - void __iomem *base = host->base; - u32 tmp; - - if (hw->flags & MSDC_EXT_SDIO_IRQ) { /* yes for sdio */ - } else { - ERR_MSG("XXX "); /* so never enter here */ - tmp = sdr_read32(SDC_CFG); - /* FIXME. Need to interrupt gap detection */ - if (enable) - tmp |= (SDC_CFG_SDIOIDE | SDC_CFG_SDIOINTWKUP); - else - tmp &= ~(SDC_CFG_SDIOIDE | SDC_CFG_SDIOINTWKUP); - sdr_write32(SDC_CFG, tmp); - } -} - static struct mmc_host_ops mt_msdc_ops = { .request = msdc_ops_request, .set_ios = msdc_ops_set_ios, .get_ro = msdc_ops_get_ro, .get_cd = msdc_ops_get_cd, - .enable_sdio_irq = msdc_ops_enable_sdio_irq, }; /*--------------------------------------------------------------------------*/ @@ -2330,9 +2308,6 @@ static int msdc_drv_probe(struct platform_device *pdev) //TODO: read this as bus-width from dt (via mmc_of_parse) mmc->caps |= MMC_CAP_4_BIT_DATA; - if ((hw->flags & MSDC_SDIO_IRQ) || (hw->flags & MSDC_EXT_SDIO_IRQ)) - mmc->caps |= MMC_CAP_SDIO_IRQ; /* yes for sdio */ - cd_active_low = !of_property_read_bool(pdev->dev.of_node, "mediatek,cd-high"); if (of_property_read_bool(pdev->dev.of_node, "mediatek,cd-poll")) |