imx233/sdmmc: {sd,mmc}_{present,removable} don't depend on multivolume
Change-Id: Id35fbdbc62b804e9a67c6d1f18b19a1d2051bb78
diff --git a/firmware/target/arm/imx233/sdmmc-imx233.c b/firmware/target/arm/imx233/sdmmc-imx233.c
index 24bf69e..a435b14 100644
--- a/firmware/target/arm/imx233/sdmmc-imx233.c
+++ b/firmware/target/arm/imx233/sdmmc-imx233.c
@@ -853,19 +853,13 @@
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 @@
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]);
}