staging: mt7621-mmc: Remove unused field data_edge from msdc_hw

The field data_edge of msdc_hw is set to a constant and only used once,
replace that position with the constant and remove the unused field.

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 af192a8205b06fda20ce9a6210f3679d24516b4f..22edbb8bbc319c2fcdd6ca626de4387ef8546291 100644 (file)
--- a/drivers/staging/mt7621-mmc/board.h
+++ b/drivers/staging/mt7621-mmc/board.h
@@ -54,7 +54,6 @@
 
 struct msdc_hw {
        unsigned char  clk_src;          /* host clock source */
-       unsigned char  data_edge;        /* data latch edge */
        unsigned char  clk_drv;          /* clock pad driving */
        unsigned char  cmd_drv;          /* command pad driving */
        unsigned char  dat_drv;          /* data pad driving */

diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index f4c33f02e75ea9382a2b6de1e4f97d8b3711f9de..9dba15edc812c7e5b96700d2ff99f423c97dac85 100644 (file)
--- a/drivers/staging/mt7621-mmc/sd.c
+++ b/drivers/staging/mt7621-mmc/sd.c
@@ -177,7 +177,6 @@ void msdc_clk_status(int *status)
 /* +++ by chhung */
 struct msdc_hw msdc0_hw = {
        .clk_src        = 0,
-       .data_edge      = MSDC_SMPL_FALLING,
        .clk_drv        = 4,
        .cmd_drv        = 4,
        .dat_drv        = 4,
@@ -2027,7 +2026,6 @@ static void msdc_set_buswidth(struct msdc_host *host, u32 width)
 static void msdc_ops_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 {
        struct msdc_host *host = mmc_priv(mmc);
-       struct msdc_hw *hw = host->hw;
        void __iomem *base = host->base;
        u32 ddr = 0;
 
@@ -2073,10 +2071,11 @@ static void msdc_ops_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
        if (host->mclk != ios->clock) {
                if (ios->clock > 25000000) {
                        //if (!(host->hw->flags & MSDC_REMOVABLE)) {
-                       INIT_MSG("SD data latch edge<%d>", hw->data_edge);
+                       INIT_MSG("SD data latch edge<%d>", MSDC_SMPL_FALLING);
                        sdr_set_field(MSDC_IOCON, MSDC_IOCON_RSPL,
                                      MSDC_SMPL_FALLING);
-                       sdr_set_field(MSDC_IOCON, MSDC_IOCON_DSPL, hw->data_edge);
+                       sdr_set_field(MSDC_IOCON, MSDC_IOCON_DSPL,
+                                     MSDC_SMPL_FALLING);
                        //} /* for tuning debug */
                } else { /* default value */
                        sdr_write32(MSDC_IOCON,      0x00000000);