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

The field cmd_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 544d736e2dad8d6004e8e457e47e4f96068db9f0..af192a8205b06fda20ce9a6210f3679d24516b4f 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  cmd_edge;         /* command latch edge */
        unsigned char  data_edge;        /* data latch edge */
        unsigned char  clk_drv;          /* clock pad driving */
        unsigned char  cmd_drv;          /* command pad driving */

diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index b78f68016190e0c90cadacbe1fb5136f3851b905..f4c33f02e75ea9382a2b6de1e4f97d8b3711f9de 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,
-       .cmd_edge       = MSDC_SMPL_FALLING,
        .data_edge      = MSDC_SMPL_FALLING,
        .clk_drv        = 4,
        .cmd_drv        = 4,
@@ -2075,7 +2074,8 @@ static void msdc_ops_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                if (ios->clock > 25000000) {
                        //if (!(host->hw->flags & MSDC_REMOVABLE)) {
                        INIT_MSG("SD data latch edge<%d>", hw->data_edge);
-                       sdr_set_field(MSDC_IOCON, MSDC_IOCON_RSPL, hw->cmd_edge);
+                       sdr_set_field(MSDC_IOCON, MSDC_IOCON_RSPL,
+                                     MSDC_SMPL_FALLING);
                        sdr_set_field(MSDC_IOCON, MSDC_IOCON_DSPL, hw->data_edge);
                        //} /* for tuning debug */
                } else { /* default value */