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, 3 insertions, 3 deletions

diff --git a/firmware/export/nand.h b/firmware/export/nand.h
index 58751ab298..fe25c9b407 100644
--- a/firmware/export/nand.h
+++ b/firmware/export/nand.h
@@ -36,8 +36,8 @@ bool nand_disk_is_active(void);
 int  nand_soft_reset(void);
 int  nand_init(void) STORAGE_INIT_ATTR;
 void nand_close(void);
-int  nand_read_sectors(IF_MD2(int drive,) unsigned long start, int count, void* buf);
-int  nand_write_sectors(IF_MD2(int drive,) unsigned long start, int count, const void* buf);
+int  nand_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf);
+int  nand_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf);
 #ifdef HAVE_STORAGE_FLUSH
 int  nand_flush(void);
 #endif
@@ -45,7 +45,7 @@ void nand_spin(void);
 int  nand_spinup_time(void); /* ticks */
 
 #ifdef STORAGE_GET_INFO
-void nand_get_info(IF_MD2(int drive,) struct storage_info *info);
+void nand_get_info(IF_MD(int drive,) struct storage_info *info);
 #endif
 
 long nand_last_disk_activity(void);