From a56f1ca1ed63b93eb61fd5319f47347b3eb1e364 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sat, 17 Aug 2013 12:18:22 -0400 Subject: 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 --- firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c | 6 +++--- firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'firmware/target/mips') diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c index f201983404..ac4092f043 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c @@ -628,7 +628,7 @@ static inline int read_sector(unsigned long start, unsigned int count, return ret; } -int nand_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf) +int nand_read_sectors(IF_MV(int drive,) unsigned long start, int count, void* buf) { #ifdef HAVE_MULTIVOLUME (void)drive; @@ -671,7 +671,7 @@ int nand_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* b } /* TODO */ -int nand_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf) +int nand_write_sectors(IF_MV(int drive,) unsigned long start, int count, const void* buf) { (void)start; (void)count; @@ -728,7 +728,7 @@ void nand_sleepnow(void) } #ifdef STORAGE_GET_INFO -void nand_get_info(IF_MV2(int drive,) struct storage_info *info) +void nand_get_info(IF_MV(int drive,) struct storage_info *info) { #ifdef HAVE_MULTIVOLUME (void)drive; diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c index 846b9095f1..9c0d1982ad 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c @@ -1266,7 +1266,7 @@ static inline void sd_stop_transfer(void) mutex_unlock(&sd_mtx); } -int sd_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf) +int sd_read_sectors(IF_MV(int drive,) unsigned long start, int count, void* buf) { #ifdef HAVE_MULTIVOLUME (void)drive; @@ -1320,7 +1320,7 @@ err: return retval; } -int sd_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf) +int sd_write_sectors(IF_MV(int drive,) unsigned long start, int count, const void* buf) { #ifdef HAVE_MULTIVOLUME (void)drive; -- cgit v1.2.3