From: Mieczyslaw Nalewaj Date: Sun, 18 May 2025 09:30:18 +0000 (+0200) Subject: mtk-mmc: replace empty body macros X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92fec1ff24c526895dc954b69bef05dee5ff812a;p=thirdparty%2Fopenwrt.git mtk-mmc: replace empty body macros Replace macros with empty body with 'do {} while (0)'. Remove unnecessary semicolons. Fixes: drivers/mmc/host/mtk-mmc/sd.c: In function 'msdc_irq': drivers/mmc/host/mtk-mmc/sd.c:1969:87: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body] 1969 | IRQ_MSG("XXX CMD<%d> MSDC_INT_RSPCRCERR", cmd->opcode); | ^ drivers/mmc/host/mtk-mmc/sd.c:1975:84: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body] 1975 | IRQ_MSG("XXX CMD<%d> MSDC_INT_CMDTMO", cmd->opcode); | ^ cc1: all warnings being treated as errors Signed-off-by: Mieczyslaw Nalewaj Link: https://github.com/openwrt/openwrt/pull/18654 Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/dbg.h b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/dbg.h index 5a25a69b00c..146c467b99e 100644 --- a/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/dbg.h +++ b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/dbg.h @@ -108,7 +108,7 @@ do { \ } while (0) #endif /* end of +++ */ -#define N_MSG(evt, fmt, args...) +#define N_MSG(evt, fmt, args...) do {} while (0) /* do { \ if ((DBG_EVT_##evt) & sd_debug_zone[host->id]) { \ @@ -122,25 +122,25 @@ do { \ do { \ printk(KERN_ERR TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ host->id, ##args, __FUNCTION__, __LINE__, current->comm, current->pid); \ -} while (0); +} while (0) #if 1 //defined CONFIG_MTK_MMC_CD_POLL -#define INIT_MSG(fmt, args...) -#define IRQ_MSG(fmt, args...) +#define INIT_MSG(fmt, args...) do {} while (0) +#define IRQ_MSG(fmt, args...) do {} while (0) #else #define INIT_MSG(fmt, args...) \ do { \ printk(KERN_ERR TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ host->id, ##args, __FUNCTION__, __LINE__, current->comm, current->pid); \ -} while (0); +} while (0) /* PID in ISR in not corrent */ #define IRQ_MSG(fmt, args...) \ do { \ printk(KERN_ERR TAG"%d -> "fmt" <- %s() : L<%d>\n", \ host->id, ##args, __FUNCTION__, __LINE__); \ -} while (0); +} while (0) #endif void msdc_debug_proc_init(void);