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

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

staging: mt7621-mmc: Remove constant flag MSDC_HIGHSPEED 



The MSDC_HIGHSPEED flag is always set and never unset, remove it to
clean up the code.

Signed-off-by: default avatarChristian Lütke-Stetzkamp <christian@lkamp.de>
Reviewed-by: default avatarNeilBrown <neil@brown.name>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bda8a65f

drivers/staging/mt7621-mmc/board.h

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ typedef void (*pm_callback_t)(pm_message_t state, void *data); 
#define MSDC_SDIO_IRQ       (1 << 3)  /* use internal sdio irq (bus)   */

#define MSDC_EXT_SDIO_IRQ   (1 << 4)  /* use external sdio irq         */

#define MSDC_REMOVABLE      (1 << 5)  /* removable slot                */

#define MSDC_HIGHSPEED      (1 << 7)  /* high-speed mode support       */

#define MSDC_UHS1           (1 << 8)  /* uhs-1 mode support            */

#define MSDC_DDR            (1 << 9)  /* ddr mode support              */

drivers/staging/mt7621-mmc/sd.c

+2 −5
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ struct msdc_hw msdc0_hw = { 
	.cmd_drv        = 4,

	.dat_drv        = 4,

	.data_offset    = 0,

	.flags          = MSDC_CD_PIN_EN | MSDC_REMOVABLE | MSDC_HIGHSPEED,

	.flags          = MSDC_CD_PIN_EN | MSDC_REMOVABLE,

//	.flags          = MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE,

};
@@ -2675,9 +2675,6 @@ static int msdc_drv_probe(struct platform_device *pdev) 
	mmc->f_max      = HOST_MAX_MCLK;

	mmc->ocr_avail  = MSDC_OCR_AVAIL;



	/* For sd card: MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE | MSDC_HIGHSPEED,

	   For sdio   : MSDC_EXT_SDIO_IRQ | MSDC_HIGHSPEED */

	if (hw->flags & MSDC_HIGHSPEED)

	mmc->caps   = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;



	//TODO: read this as bus-width from dt (via mmc_of_parse)