From: Christian Lütke-Stetzkamp Date: Sun, 29 Apr 2018 17:32:17 +0000 (+0200) Subject: staging: mt7621-mmc: Remove unused field dat_drv from msdc_hw X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f46a0ae597332484691cfa499477d5f12bfaf11f;p=openwrt%2Fstaging%2Fblogic.git staging: mt7621-mmc: Remove unused field dat_drv from msdc_hw The field dat_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 Reviewed-by: NeilBrown Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/mt7621-mmc/board.h b/drivers/staging/mt7621-mmc/board.h index 22edbb8bbc31..a2ad8237cf13 100644 --- a/drivers/staging/mt7621-mmc/board.h +++ b/drivers/staging/mt7621-mmc/board.h @@ -56,7 +56,6 @@ struct msdc_hw { unsigned char clk_src; /* host clock source */ unsigned char clk_drv; /* clock pad driving */ unsigned char cmd_drv; /* command pad driving */ - unsigned char dat_drv; /* data 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 9dba15edc812..0daf06f3c4a9 100644 --- a/drivers/staging/mt7621-mmc/sd.c +++ b/drivers/staging/mt7621-mmc/sd.c @@ -179,7 +179,6 @@ struct msdc_hw msdc0_hw = { .clk_src = 0, .clk_drv = 4, .cmd_drv = 4, - .dat_drv = 4, .flags = MSDC_CD_PIN_EN | MSDC_REMOVABLE, // .flags = MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE, }; @@ -2447,8 +2446,8 @@ static void msdc_init_hw(struct msdc_host *host) sdr_set_field(MSDC_PAD_CTL0, MSDC_PAD_CTL0_CLKDRVP, hw->clk_drv); sdr_set_field(MSDC_PAD_CTL1, MSDC_PAD_CTL1_CMDDRVN, hw->cmd_drv); sdr_set_field(MSDC_PAD_CTL1, MSDC_PAD_CTL1_CMDDRVP, hw->cmd_drv); - sdr_set_field(MSDC_PAD_CTL2, MSDC_PAD_CTL2_DATDRVN, hw->dat_drv); - sdr_set_field(MSDC_PAD_CTL2, MSDC_PAD_CTL2_DATDRVP, hw->dat_drv); + sdr_set_field(MSDC_PAD_CTL2, MSDC_PAD_CTL2_DATDRVN, 4); + sdr_set_field(MSDC_PAD_CTL2, MSDC_PAD_CTL2_DATDRVP, 4); #else sdr_set_field(MSDC_PAD_CTL0, MSDC_PAD_CTL0_CLKDRVN, 0); sdr_set_field(MSDC_PAD_CTL0, MSDC_PAD_CTL0_CLKDRVP, 0);