From 75dc601738d6c940455de5948cb33e6098b3fa72 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Wed, 20 Nov 2013 16:38:54 +0000 Subject: imx233/sdmmc: {sd,mmc}_{present,removable} don't depend on multivolume Change-Id: Id35fbdbc62b804e9a67c6d1f18b19a1d2051bb78 --- firmware/target/arm/imx233/sdmmc-imx233.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'firmware/target/arm/imx233/sdmmc-imx233.c') diff --git a/firmware/target/arm/imx233/sdmmc-imx233.c b/firmware/target/arm/imx233/sdmmc-imx233.c index 24bf69e332..a435b149f2 100644 --- a/firmware/target/arm/imx233/sdmmc-imx233.c +++ b/firmware/target/arm/imx233/sdmmc-imx233.c @@ -853,19 +853,13 @@ int sd_num_drives(int first_drive) return _sd_num_drives; } -bool sd_present(IF_MV_NONVOID(int sd_drive)) +bool sd_present(int sd_drive) { -#ifndef HAVE_MULTIVOLUME - int sd_drive = 0; -#endif return sdmmc_present(sd_map[sd_drive]); } -bool sd_removable(IF_MV_NONVOID(int sd_drive)) +bool sd_removable(int sd_drive) { -#ifndef HAVE_MULTIVOLUME - int sd_drive = 0; -#endif return sdmmc_removable(sd_map[sd_drive]); } @@ -934,19 +928,13 @@ int mmc_num_drives(int first_drive) return _mmc_num_drives; } -bool mmc_present(IF_MV_NONVOID(int mmc_drive)) +bool mmc_present(int mmc_drive) { -#ifndef HAVE_MULTIVOLUME - int mmc_drive = 0; -#endif return sdmmc_present(mmc_map[mmc_drive]); } -bool mmc_removable(IF_MV_NONVOID(int mmc_drive)) +bool mmc_removable(int mmc_drive) { -#ifndef HAVE_MULTIVOLUME - int mmc_drive = 0; -#endif return sdmmc_removable(mmc_map[mmc_drive]); } -- cgit