From c13b45c555de0538a122a6511be71274d54d23d7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20L=C3=BCtke-Stetzkamp?= Date: Wed, 4 Apr 2018 22:15:38 +0200 Subject: [PATCH] staging: mt7621-mmc: Remove unnecessary field from struct msdc_hw MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/mt7621-mmc/board.h | 1 - drivers/staging/mt7621-mmc/sd.c | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/staging/mt7621-mmc/board.h b/drivers/staging/mt7621-mmc/board.h index b9cf7b875cfa..aa62a7243c80 100644 --- 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 e8846b7c545b..70f9649adfa4 100644 --- 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 */ -- 2.11.0