imx233: simplify sd/mmc code

Change-Id: I7e36b4c1c91540a2ae383109e440818bc610dde6
This commit is contained in:
Amaury Pouly 2013-10-02 16:51:28 +02:00
parent 5b3eaf6f5b
commit 187017bad1

View file

@ -190,19 +190,19 @@ static int init_drive(int drive);
* refer to sd/mmc drive indexes. We keep two maps sd->sdmmc and mmc->sdmmc * refer to sd/mmc drive indexes. We keep two maps sd->sdmmc and mmc->sdmmc
* to find the sdmmc index from the sd or mmc one */ * to find the sdmmc index from the sd or mmc one */
static int sdmmc_present(int drive)
{
if(SDMMC_FLAGS(drive) & REMOVABLE)
return imx233_ssp_sdmmc_detect(SDMMC_SSP(drive));
else
return true;
}
static inline int sdmmc_removable(int drive) static inline int sdmmc_removable(int drive)
{ {
return SDMMC_FLAGS(drive) & REMOVABLE; return SDMMC_FLAGS(drive) & REMOVABLE;
} }
static int sdmmc_present(int drive)
{
if(sdmmc_removable(drive))
return imx233_ssp_sdmmc_detect(SDMMC_SSP(drive));
else
return true;
}
static void sdmmc_detect_callback(int ssp) static void sdmmc_detect_callback(int ssp)
{ {
/* This is called only if the state was stable for 300ms - check state /* This is called only if the state was stable for 300ms - check state
@ -790,7 +790,7 @@ static int sdmmc_init(void)
for(unsigned drive = 0; drive < SDMMC_NUM_DRIVES; drive++) for(unsigned drive = 0; drive < SDMMC_NUM_DRIVES; drive++)
{ {
if(SDMMC_FLAGS(drive) & REMOVABLE) if(sdmmc_removable(drive))
imx233_ssp_sdmmc_setup_detect(SDMMC_SSP(drive), true, sdmmc_detect_callback, imx233_ssp_sdmmc_setup_detect(SDMMC_SSP(drive), true, sdmmc_detect_callback,
false, SDMMC_FLAGS(drive) & DETECT_INVERTED); false, SDMMC_FLAGS(drive) & DETECT_INVERTED);
} }