summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorAndreas Fenkart <afenkart@gmail.com>2015-03-03 13:28:18 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2015-03-31 16:50:44 +0200
commite03de74516ec434aea77cfcf276df9c87fc7285a (patch)
treef032e330c36eaaf82d3cedcff90a20c5b37dad8f /drivers/mmc
parentmmc: omap_hsmmc: simplify card/cover detect isr (diff)
downloadlinux-e03de74516ec434aea77cfcf276df9c87fc7285a.tar.xz
linux-e03de74516ec434aea77cfcf276df9c87fc7285a.zip
mmc: omap_hsmmc: use generic slot-gpio isr to manage card detect pin
Signed-off-by: Andreas Fenkart <afenkart@gmail.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/omap_hsmmc.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index ea7028517124..9df2b6801f76 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -418,7 +418,6 @@ static inline int omap_hsmmc_have_reg(void)
#endif
-static irqreturn_t omap_hsmmc_detect(int irq, void *dev_id);
static irqreturn_t omap_hsmmc_cover_irq(int irq, void *dev_id);
static int omap_hsmmc_gpio_init(struct mmc_host *mmc,
@@ -440,7 +439,6 @@ static int omap_hsmmc_gpio_init(struct mmc_host *mmc,
return ret;
host->card_detect = omap_hsmmc_card_detect;
- mmc_gpio_set_cd_isr(mmc, omap_hsmmc_detect);
}
if (gpio_is_valid(pdata->gpio_wp)) {
@@ -1249,17 +1247,6 @@ static irqreturn_t omap_hsmmc_cover_irq(int irq, void *dev_id)
return IRQ_HANDLED;
}
-/*
- * irq handler to notify the core about card insertion/removal
- */
-static irqreturn_t omap_hsmmc_detect(int irq, void *dev_id)
-{
- struct omap_hsmmc_host *host = dev_id;
-
- mmc_detect_change(host->mmc, (HZ * 200) / 1000);
- return IRQ_HANDLED;
-}
-
static void omap_hsmmc_dma_callback(void *param)
{
struct omap_hsmmc_host *host = param;