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

The field clk_drv 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 4c8499891c2f5136b49c60d8971323cc13f54651..7e0c469a444db78a22b5ac1f6651eabcef0f49fd 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  clk_drv;          /* clock pad driving */
        unsigned long  flags;            /* hardware capability flags */
 
        /* config gpio pull mode */

diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index 6c901ac83e2f6c92f281e05fa5127dae70522c9a..e94b2bafa8eb7d990e76b8c8357ce8b0e8e7a7f4 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,
-       .clk_drv        = 4,
        .flags          = MSDC_CD_PIN_EN | MSDC_REMOVABLE,
 //     .flags          = MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE,
 };
@@ -2371,7 +2370,6 @@ static void msdc_enable_cd_irq(struct msdc_host *host, int enable)
 static void msdc_init_hw(struct msdc_host *host)
 {
        void __iomem *base = host->base;
-       struct msdc_hw *hw = host->hw;
 
 #ifdef MT6575_SD_DEBUG
        msdc_reg[host->id] = (struct msdc_regs *)host->base;
@@ -2441,8 +2439,8 @@ static void msdc_init_hw(struct msdc_host *host)
 
 #if 1
        /* set clk, cmd, dat pad driving */
-       sdr_set_field(MSDC_PAD_CTL0, MSDC_PAD_CTL0_CLKDRVN, hw->clk_drv);
-       sdr_set_field(MSDC_PAD_CTL0, MSDC_PAD_CTL0_CLKDRVP, hw->clk_drv);
+       sdr_set_field(MSDC_PAD_CTL0, MSDC_PAD_CTL0_CLKDRVN, 4);
+       sdr_set_field(MSDC_PAD_CTL0, MSDC_PAD_CTL0_CLKDRVP, 4);
        sdr_set_field(MSDC_PAD_CTL1, MSDC_PAD_CTL1_CMDDRVN, 4);
        sdr_set_field(MSDC_PAD_CTL1, MSDC_PAD_CTL1_CMDDRVP, 4);
        sdr_set_field(MSDC_PAD_CTL2, MSDC_PAD_CTL2_DATDRVN, 4);