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

Commit ec7375d1 authored by Christian Lütke-Stetzkamp's avatar Christian Lütke-Stetzkamp Committed by Greg Kroah-Hartman
Browse files

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: default avatarChristian Lütke-Stetzkamp <christian@lkamp.de>
Reviewed-by: default avatarNeilBrown <neil@brown.name>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 23f37ef7

drivers/staging/mt7621-mmc/board.h

+0 −2
Original line number Diff line number Diff line
@@ -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)

drivers/staging/mt7621-mmc/sd.c

+0 −25
Original line number Diff line number Diff line
@@ -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"))