On Sun, Sep 6, 2015 at 11:45 PM, Sai Pavan Boddu <sai.pavan.bo...@xilinx.com> wrote: > Conditionaly compilation hides few type mismatch warnings, fix it to
"conditional" > compile unconditioinal. > "unconditionally" > Signed-off-by: Sai Pavan Boddu <saip...@xilinx.com> > Suggested-by: Eric Blake <ebl...@redhat.com> Otherwise: Reviewed-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com> Can trivial take these two? Regards, Peter > --- > hw/sd/sdhci.c | 36 ++++++++++++++++++------------------ > 1 file changed, 18 insertions(+), 18 deletions(-) > > diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c > index 639feee..3ad6c76 100644 > --- a/hw/sd/sdhci.c > +++ b/hw/sd/sdhci.c > @@ -37,24 +37,24 @@ > #define SDHC_DEBUG 0 > #endif > > -#if SDHC_DEBUG == 0 > - #define DPRINT_L1(fmt, args...) do { } while (0) > - #define DPRINT_L2(fmt, args...) do { } while (0) > - #define ERRPRINT(fmt, args...) do { } while (0) > -#elif SDHC_DEBUG == 1 > - #define DPRINT_L1(fmt, args...) \ > - do {fprintf(stderr, "QEMU SDHC: "fmt, ## args); } while (0) > - #define DPRINT_L2(fmt, args...) do { } while (0) > - #define ERRPRINT(fmt, args...) \ > - do {fprintf(stderr, "QEMU SDHC ERROR: "fmt, ## args); } while (0) > -#else > - #define DPRINT_L1(fmt, args...) \ > - do {fprintf(stderr, "QEMU SDHC: "fmt, ## args); } while (0) > - #define DPRINT_L2(fmt, args...) \ > - do {fprintf(stderr, "QEMU SDHC: "fmt, ## args); } while (0) > - #define ERRPRINT(fmt, args...) \ > - do {fprintf(stderr, "QEMU SDHC ERROR: "fmt, ## args); } while (0) > -#endif > +#define DPRINT_L1(fmt, args...) \ > + do { \ > + if (SDHC_DEBUG) { \ > + fprintf(stderr, "QEMU SDHC: " fmt, ## args); \ > + } \ > + } while (0) > +#define DPRINT_L2(fmt, args...) \ > + do { \ > + if (SDHC_DEBUG > 1) { \ > + fprintf(stderr, "QEMU SDHC: " fmt, ## args); \ > + } \ > + } while (0) > +#define ERRPRINT(fmt, args...) \ > + do { \ > + if (SDHC_DEBUG) { \ > + fprintf(stderr, "QEMU SDHC ERROR: " fmt, ## args); \ > + } \ > + } while (0) > > /* Default SD/MMC host controller features information, which will be > * presented in CAPABILITIES register of generic SD host controller at reset. > -- > 1.9.1 >