diff options
| author | Christian Lütke-Stetzkamp <christian@lkamp.de> | 2018-04-29 19:32:19 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-06 19:08:05 -0700 |
| commit | a3edb7c1ef16851c36970bab8421ef93f46c3f91 (patch) | |
| tree | 06337efd22381015948e0a3cabc214290ff7299c /drivers/staging/mt7621-mmc | |
| parent | a1972612c82e2d270ba9ccfe2b77ef9040c8769a (diff) | |
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>
Diffstat (limited to 'drivers/staging/mt7621-mmc')
| -rw-r--r-- | drivers/staging/mt7621-mmc/board.h | 1 | ||||
| -rw-r--r-- | drivers/staging/mt7621-mmc/sd.c | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/mt7621-mmc/board.h b/drivers/staging/mt7621-mmc/board.h index 4c8499891c2f..7e0c469a444d 100644 --- 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 6c901ac83e2f..e94b2bafa8eb 100644 --- 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); |