staging: mt7621-mmc: Remove unnecessary field from struct msdc_hw

Remove the unnecessary field data_pins from msdc_hw, later this
information should be taken from the device tree.

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 b9cf7b8..aa62a72 100644 (file)
--- a/drivers/staging/mt7621-mmc/board.h
+++ b/drivers/staging/mt7621-mmc/board.h
@@ -81,7 +81,6 @@ struct msdc_hw {
        unsigned char  cmd_drv;          /* command pad driving */
        unsigned char  dat_drv;          /* data pad driving */
        unsigned long  flags;            /* hardware capability flags */
-       unsigned long  data_pins;        /* data pins */
        unsigned long  data_offset;      /* data address offset */
 
        /* config gpio pull mode */

diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index e8846b7..70f9649 100644 (file)
--- a/drivers/staging/mt7621-mmc/sd.c
+++ b/drivers/staging/mt7621-mmc/sd.c
@@ -192,7 +192,6 @@ struct msdc_hw msdc0_hw = {
        .clk_drv        = 4,
        .cmd_drv        = 4,
        .dat_drv        = 4,
-       .data_pins      = 4,
        .data_offset    = 0,
        .flags          = MSDC_SYS_SUSPEND | MSDC_CD_PIN_EN | MSDC_REMOVABLE | MSDC_HIGHSPEED,
 //     .flags          = MSDC_SYS_SUSPEND | MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE,
@@ -2732,11 +2731,10 @@ static int msdc_drv_probe(struct platform_device *pdev)
           For sdio   : MSDC_EXT_SDIO_IRQ | MSDC_HIGHSPEED */
        if (hw->flags & MSDC_HIGHSPEED)
                mmc->caps   = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
-       if (hw->data_pins == 4) { /* current data_pins are all 4*/
-               mmc->caps  |= MMC_CAP_4_BIT_DATA;
-       } else if (hw->data_pins == 8) {
-               mmc->caps  |= MMC_CAP_8_BIT_DATA;
-       }
+
+       //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 */