staging: mt7621-mmc: Remove unused field disable_cd_eirq

The disable_cd_eirq() field of msdc_hw is never set and only once
checked for being non zero, so it is deleted.

Signed-off-by: Christian Lütke-Stetzkamp <christian@lkamp.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/mt7621-mmc/board.h b/drivers/staging/mt7621-mmc/board.h
index ce33d59..e423077 100644 (file)
--- a/drivers/staging/mt7621-mmc/board.h
+++ b/drivers/staging/mt7621-mmc/board.h
@@ -72,9 +72,6 @@ struct msdc_hw {
        /* external sdio irq operations */
        void (*enable_sdio_eirq)(void);
        void (*disable_sdio_eirq)(void);
-
-       /* external cd irq operations */
-       void (*disable_cd_eirq)(void);
 };
 
 extern struct msdc_hw msdc0_hw;

diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index f97b3d4..d803bfb 100644 (file)
--- a/drivers/staging/mt7621-mmc/sd.c
+++ b/drivers/staging/mt7621-mmc/sd.c
@@ -2467,21 +2467,17 @@ static void msdc_enable_cd_irq(struct msdc_host *host, int enable)
                sdr_set_bits(MSDC_INTEN, MSDC_INTEN_CDSC);
                sdr_set_bits(SDC_CFG, SDC_CFG_INSWKUP);  /* not in document! Fix me */
        } else {
-               if (hw->disable_cd_eirq) {
-                       hw->disable_cd_eirq();
-               } else {
-                       if (hw->config_gpio_pin) /* NULL */
-                               hw->config_gpio_pin(MSDC_CD_PIN, GPIO_PULL_DOWN);
+               if (hw->config_gpio_pin) /* NULL */
+                       hw->config_gpio_pin(MSDC_CD_PIN, GPIO_PULL_DOWN);
 
-                       sdr_clr_bits(SDC_CFG, SDC_CFG_INSWKUP);
-                       sdr_clr_bits(MSDC_PS, MSDC_PS_CDEN);
-                       sdr_clr_bits(MSDC_INTEN, MSDC_INTEN_CDSC);
+               sdr_clr_bits(SDC_CFG, SDC_CFG_INSWKUP);
+               sdr_clr_bits(MSDC_PS, MSDC_PS_CDEN);
+               sdr_clr_bits(MSDC_INTEN, MSDC_INTEN_CDSC);
 
-                       /* Here decreases a reference count to core power since card
-                        * detection circuit is shutdown.
-                        */
-                       //msdc_vcore_off(host);
-               }
+               /* Here decreases a reference count to core power since card
+                * detection circuit is shutdown.
+                */
+               //msdc_vcore_off(host);
        }
 }