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/rbutil/mkrk27boot/mkrk27boot.c b/rbutil/mkrk27boot/mkrk27boot.c
index 4b51e281c7..0ecdf93506 100644
--- a/rbutil/mkrk27boot/mkrk27boot.c
+++ b/rbutil/mkrk27boot/mkrk27boot.c
@@ -170,7 +170,7 @@ static int mkrk27_init(const char *filename) {
              || pinfo[i].type == PARTITION_TYPE_FAT16
 #endif
             ) {
-            rc = fat_mount(IF_MV2(0,) IF_MD2(0,) pinfo[i].start);
+            rc = fat_mount(IF_MV(0,) IF_MD(0,) pinfo[i].start);
             if(rc) {
                 mkrk27_set_error("mount: %d",rc);
                 return -1;
@@ -179,7 +179,7 @@ static int mkrk27_init(const char *filename) {
         }
     }
     if ( i==4 ) {
-        if(fat_mount(IF_MV2(0,) IF_MD2(0,) 0)) {
+        if(fat_mount(IF_MV(0,) IF_MD(0,) 0)) {
             mkrk27_set_error("FAT32 partition!");
             return -1;
         }