staging: mt7621-mmc: Remove constant flag MSDC_HIGHSPEED

The MSDC_HIGHSPEED flag is always set and never unset, remove it to
clean up the code.

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>

diff --git a/drivers/staging/mt7621-mmc/board.h b/drivers/staging/mt7621-mmc/board.h
index ca07608b8f445b4b5b86ee8662d5e13596d87270..312cd5116c37aa9798cc90fcdf5f9ccd718d1ef1 100644 (file)
--- a/drivers/staging/mt7621-mmc/board.h
+++ b/drivers/staging/mt7621-mmc/board.h
@@ -52,7 +52,6 @@ typedef void (*pm_callback_t)(pm_message_t state, void *data);
 #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_HIGHSPEED      (1 << 7)  /* high-speed mode support       */
 #define MSDC_UHS1           (1 << 8)  /* uhs-1 mode support            */
 #define MSDC_DDR            (1 << 9)  /* ddr mode support              */
 

diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index b42c1ea4159ec409e5327de1883d2afacfad51d0..feebeed1fd597d6f25220a09c5abb10401faa283 100644 (file)
--- a/drivers/staging/mt7621-mmc/sd.c
+++ b/drivers/staging/mt7621-mmc/sd.c
@@ -183,7 +183,7 @@ struct msdc_hw msdc0_hw = {
        .cmd_drv        = 4,
        .dat_drv        = 4,
        .data_offset    = 0,
-       .flags          = MSDC_CD_PIN_EN | MSDC_REMOVABLE | MSDC_HIGHSPEED,
+       .flags          = MSDC_CD_PIN_EN | MSDC_REMOVABLE,
 //     .flags          = MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE,
 };
 
@@ -2675,10 +2675,7 @@ static int msdc_drv_probe(struct platform_device *pdev)
        mmc->f_max      = HOST_MAX_MCLK;
        mmc->ocr_avail  = MSDC_OCR_AVAIL;
 
-       /* For sd card: MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE | MSDC_HIGHSPEED,
-          For sdio   : MSDC_EXT_SDIO_IRQ | MSDC_HIGHSPEED */
-       if (hw->flags & MSDC_HIGHSPEED)
-               mmc->caps   = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
+       mmc->caps   = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
 
        //TODO: read this as bus-width from dt (via mmc_of_parse)
        mmc->caps  |= MMC_CAP_4_BIT_DATA;