Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1972612 authored by Christian Lütke-Stetzkamp's avatar Christian Lütke-Stetzkamp Committed by Greg Kroah-Hartman
Browse files

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



The field cmd_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: default avatarChristian Lütke-Stetzkamp <christian@lkamp.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f46a0ae5

drivers/staging/mt7621-mmc/board.h

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,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 long  flags;            /* hardware capability flags */



	/* config gpio pull mode */

drivers/staging/mt7621-mmc/sd.c

+2 −3
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ void msdc_clk_status(int *status) 
struct msdc_hw msdc0_hw = {

	.clk_src        = 0,

	.clk_drv        = 4,

	.cmd_drv        = 4,

	.flags          = MSDC_CD_PIN_EN | MSDC_REMOVABLE,

//	.flags          = MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE,

};
@@ -2444,8 +2443,8 @@ static void msdc_init_hw(struct msdc_host *host) 
	/* 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_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_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);

	sdr_set_field(MSDC_PAD_CTL2, MSDC_PAD_CTL2_DATDRVP, 4);

#else