mmc: omap_hsmmc: use generic slot-gpio isr to manage card detect pin
authorAndreas Fenkart <afenkart@gmail.com>
Tue, 3 Mar 2015 12:28:18 +0000 (13:28 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 31 Mar 2015 14:50:44 +0000 (16:50 +0200)
Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/omap_hsmmc.c

index ea70285171249da81ca06d30c6dd2d6e59e036c1..9df2b6801f767c9c0da6904b689299c93d031417 100644 (file)
@@ -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;