Cleanup MV/MD macros a little.

When using variadic macros there's no need for IF_MD2/IF_MV2 to deal
with function parameters. IF_MD/IF_MV are enough.

Throw in IF_MD_DRV/ID_MV_VOL that return the parameter if MD/MV, or 0
if not.

Change-Id: I7605e6039f3be19cb47110c84dcb3c5516f2c3eb

1 files changed, 2 insertions, 2 deletions

diff --git a/firmware/common/file.c b/firmware/common/file.c
index cfebd0622f..920eada84e 100644
--- a/firmware/common/file.c
+++ b/firmware/common/file.c
@@ -121,7 +121,7 @@ static int open_internal(const char* pathname, int flags, bool use_cache)
         }
 
         long startcluster = _dircache_get_entry_startcluster(ce);
-        fat_open(IF_MV2(volume,)
+        fat_open(IF_MV(volume,)
                  startcluster,
                  &(file->fatfile),
                  NULL);
@@ -167,7 +167,7 @@ static int open_internal(const char* pathname, int flags, bool use_cache)
     /* scan dir for name */
     while ((entry = readdir_uncached(dir))) {
         if ( !strcasecmp(name, entry->d_name) ) {
-            fat_open(IF_MV2(dir->fatdir.file.volume,)
+            fat_open(IF_MV(dir->fatdir.file.volume,)
                      entry->startcluster,
                      &(file->fatfile),
                      &(dir->fatdir));