From a9566ccc56838f6ce8ce480f44aba9cde8eb0c03 Mon Sep 17 00:00:00 2001 From: Tashfin Shakeer Rhythm Date: Fri, 24 Feb 2023 14:42:46 +0600 Subject: [PATCH] msm-4.14: Make macros no-op using `((void)0)` Do not solely rely on compiler optimizations to get the workaround of having macros do nothing using an empty do-while loop. It's inefficient. Use ((void)0) to which the standard assert macro expands when NDEBUG is defined. No functional change intended. [mcdofrenchfreis]: Implement this patch to tree using the command: git grep -l "do {} while (0)" | xargs sed -i "s/do {} while (0)/((void)0)/g" Change-Id: I9615c62c46670e31ed8d0d89d195144541baa3e6 Signed-off-by: Tashfin Shakeer Rhythm Signed-off-by: mcdofrenchfreis Signed-off-by: Richard Raya --- arch/alpha/kernel/core_cia.c | 4 +- arch/alpha/kernel/pci_impl.h | 4 +- arch/arm/mach-omap2/pm.h | 2 +- arch/arm/mach-pxa/cm-x2xx-pci.h | 6 +- arch/arm/mach-pxa/palm27x.h | 2 +- arch/arm/plat-omap/dma.c | 4 +- arch/c6x/include/asm/cacheflush.h | 20 ++-- arch/cris/include/asm/fb.h | 2 +- arch/frv/include/asm/pgtable.h | 2 +- arch/frv/include/asm/timex.h | 4 +- arch/h8300/include/asm/pgtable.h | 2 +- arch/hexagon/include/asm/pgalloc.h | 2 +- arch/ia64/include/asm/irqflags.h | 2 +- arch/m68k/include/asm/fb.h | 2 +- arch/m68k/include/asm/mcf_pgtable.h | 2 +- arch/m68k/include/asm/sun3_pgtable.h | 2 +- arch/metag/include/asm/cacheflush.h | 2 +- arch/metag/include/asm/da.h | 2 +- arch/microblaze/include/asm/pgtable.h | 4 +- arch/mips/boot/compressed/decompress.c | 4 +- arch/mips/include/asm/watch.h | 2 +- arch/mips/kernel/setup.c | 2 +- arch/mips/pci/pci-alchemy.c | 2 +- arch/mn10300/include/asm/cacheflush.h | 104 +++++++++--------- arch/mn10300/include/asm/gdb-stub.h | 2 +- arch/mn10300/include/asm/io.h | 2 +- arch/mn10300/include/asm/kprobes.h | 2 +- arch/mn10300/include/asm/mmu_context.h | 6 +- arch/mn10300/include/asm/pci.h | 4 +- arch/mn10300/include/asm/pgtable.h | 2 +- arch/mn10300/include/asm/switch_to.h | 2 +- arch/mn10300/kernel/smp.c | 6 +- arch/mn10300/mm/misalignment.c | 2 +- arch/mn10300/unit-asb2364/include/unit/leds.h | 2 +- .../include/asm/book3s/64/tlbflush-hash.h | 2 +- arch/powerpc/include/asm/dcr-native.h | 2 +- arch/powerpc/include/asm/fs_pd.h | 2 +- arch/powerpc/platforms/83xx/mpc83xx.h | 2 +- arch/score/include/asm/cacheflush.h | 10 +- arch/score/include/asm/pgalloc.h | 2 +- arch/score/include/asm/pgtable.h | 4 +- arch/score/include/asm/processor.h | 2 +- arch/score/include/asm/tlb.h | 6 +- arch/sparc/include/asm/kprobes.h | 2 +- arch/sparc/include/asm/tlbflush_64.h | 2 +- arch/sparc/kernel/cpumap.h | 2 +- arch/tile/include/asm/homecache.h | 4 +- arch/um/include/asm/tlb.h | 2 +- arch/x86/crypto/sha1-mb/sha1_mb_ctx.h | 2 +- arch/x86/crypto/sha256-mb/sha256_mb_ctx.h | 2 +- arch/x86/crypto/sha512-mb/sha512_mb_ctx.h | 2 +- arch/x86/include/asm/kvm_para.h | 2 +- arch/x86/include/asm/mc146818rtc.h | 4 +- arch/x86/include/asm/mtrr.h | 12 +- arch/x86/kernel/cpu/vmware.c | 2 +- arch/x86/kvm/lapic.c | 2 +- block/bfq-iosched.h | 2 +- block/cfq-iosched.c | 2 +- block/partitions/ldm.c | 2 +- drivers/atm/fore200e.c | 4 +- drivers/base/devres.c | 4 +- drivers/crypto/bcm/util.h | 10 +- drivers/crypto/nx/nx.h | 4 +- .../qat/qat_common/adf_transport_internal.h | 4 +- drivers/dma/pl330.c | 4 +- drivers/hwtracing/coresight/coresight-catu.c | 2 +- drivers/i2c/algos/i2c-algo-bit.c | 2 +- drivers/ide/ide-acpi.c | 2 +- drivers/ide/ide-atapi.c | 2 +- drivers/ide/ide-cd.h | 2 +- drivers/ide/ide-gd.h | 2 +- drivers/ide/ide-tape.c | 2 +- drivers/infiniband/hw/nes/nes.h | 2 +- drivers/input/joystick/grip_mp.c | 2 +- drivers/input/joystick/sidewinder.c | 2 +- drivers/input/keyboard/lkkbd.c | 2 +- drivers/input/mouse/vsxxxaa.c | 2 +- drivers/irqchip/irq-metag-ext.c | 2 +- drivers/isdn/gigaset/gigaset.h | 2 +- drivers/isdn/hisax/hisax_debug.h | 6 +- drivers/isdn/hisax/st5481.h | 2 +- .../media/platform/soc_camera/soc_camera.c | 4 +- drivers/media/usb/pvrusb2/pvrusb2-io.c | 2 +- drivers/media/usb/usbvision/usbvision-core.c | 2 +- drivers/media/usb/usbvision/usbvision-video.c | 2 +- drivers/mmc/host/au1xmmc.c | 2 +- drivers/net/ethernet/dnet.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_osdep.h | 2 +- .../net/ethernet/intel/i40evf/i40e_osdep.h | 2 +- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 6 +- drivers/net/ethernet/realtek/8139too.c | 2 +- drivers/net/ethernet/realtek/r8169.c | 4 +- drivers/net/ethernet/sfc/falcon/net_driver.h | 4 +- drivers/net/ethernet/sfc/net_driver.h | 4 +- drivers/net/ethernet/smsc/smsc911x.h | 4 +- drivers/net/ethernet/via/via-velocity.c | 4 +- drivers/net/wan/dscc4.c | 2 +- drivers/net/wireless/ath/ath.h | 2 +- drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +- drivers/net/wireless/intel/ipw2x00/ipw2200.c | 2 +- drivers/net/wireless/intel/ipw2x00/ipw2200.h | 2 +- drivers/net/wireless/intel/ipw2x00/libipw.h | 2 +- drivers/net/wireless/marvell/libertas/defs.h | 4 +- .../wireless/marvell/libertas_tf/deb_defs.h | 4 +- drivers/pcmcia/i82092aa.h | 6 +- drivers/rapidio/devices/rio_mport_cdev.c | 2 +- drivers/rapidio/devices/tsi721.h | 4 +- drivers/s390/block/dasd.c | 4 +- drivers/scsi/53c700.h | 6 +- drivers/scsi/NCR5380.h | 4 +- drivers/scsi/dc395x.c | 2 +- drivers/scsi/osd/osd_debug.h | 2 +- drivers/scsi/qla4xxx/ql4_dbg.h | 16 +-- drivers/spi/spi-gpio.c | 2 +- drivers/staging/ccree/ssi_driver.h | 2 +- .../include/linux/libcfs/libcfs_private.h | 20 ++-- .../include/linux/libcfs/linux/libcfs.h | 2 +- .../lustre/lnet/klnds/o2iblnd/o2iblnd.h | 2 +- .../staging/lustre/lustre/include/obd_class.h | 4 +- .../lustre/lustre/include/obd_support.h | 2 +- .../staging/lustre/lustre/mdc/mdc_request.c | 2 +- .../lustre/lustre/ptlrpc/pack_generic.c | 4 +- .../qca-wifi-host-cmn/qdf/inc/qdf_lock.h | 22 ++-- drivers/staging/rtl8188eu/hal/usb_halinit.c | 2 +- drivers/staging/rtl8188eu/include/rtw_mlme.h | 6 +- .../staging/rtl8192u/ieee80211/ieee80211.h | 2 +- drivers/staging/rtl8192u/r8192U.h | 4 +- drivers/staging/rtl8723bs/hal/odm_debug.h | 4 +- .../staging/rtl8723bs/include/osdep_service.h | 4 +- drivers/staging/rtl8723bs/include/rtw_debug.h | 10 +- .../target/iscsi/iscsi_target_parameters.c | 2 +- drivers/tty/n_r3964.c | 10 +- drivers/tty/pty.c | 2 +- drivers/tty/tty_ioctl.c | 2 +- drivers/usb/common/usb-otg-fsm.c | 2 +- drivers/usb/core/sysfs.c | 4 +- drivers/usb/core/usb.h | 2 +- drivers/usb/dwc2/core.h | 2 +- drivers/usb/dwc2/hcd.h | 2 +- drivers/usb/gadget/ci13xxx_udc.h | 4 +- drivers/usb/gadget/legacy/ether.c | 2 +- drivers/usb/gadget/udc/amd5536udc.h | 2 +- drivers/usb/gadget/udc/fsl_udc_core.c | 4 +- drivers/usb/gadget/udc/pxa25x_udc.c | 4 +- drivers/usb/gadget/udc/pxa27x_udc.c | 2 +- drivers/usb/host/isp1362.h | 24 ++-- drivers/usb/host/ohci-pxa27x.c | 2 +- drivers/usb/musb/blackfin.h | 2 +- drivers/usb/phy/phy-fsl-usb.c | 2 +- drivers/video/fbdev/au1100fb.h | 2 +- drivers/video/fbdev/au1200fb.c | 2 +- drivers/video/fbdev/nvidia/nvidia.c | 4 +- drivers/video/fbdev/pxa3xx-gcu.c | 2 +- drivers/video/fbdev/pxafb.c | 2 +- fs/btrfs/extent_io.c | 8 +- fs/cachefiles/internal.h | 12 +- fs/cifs/cifsglob.h | 6 +- fs/exofs/inode.c | 2 +- fs/exofs/ore_raid.h | 2 +- fs/exofs/super.c | 2 +- fs/ext2/balloc.c | 2 +- fs/fscache/internal.h | 16 +-- fs/jbd2/journal.c | 4 +- fs/jffs2/os-linux.h | 8 +- fs/jfs/jfs_debug.h | 10 +- fs/ntfs/debug.h | 2 +- include/asm-generic/fb.h | 2 +- include/asm-generic/io.h | 2 +- include/asm-generic/pgtable.h | 8 +- include/asm-generic/tlb.h | 6 +- include/linux/blktrace_api.h | 2 +- include/linux/cb710.h | 2 +- include/linux/genl_magic_func.h | 6 +- include/linux/highmem.h | 2 +- include/linux/hugetlb.h | 2 +- include/linux/jbd2.h | 12 +- include/linux/lockdep.h | 6 +- include/linux/mmzone.h | 4 +- include/linux/nodemask.h | 2 +- include/linux/platform_data/keypad-omap.h | 2 +- include/linux/pm.h | 6 +- include/linux/proc_fs.h | 2 +- include/linux/rmap.h | 4 +- include/linux/smp.h | 2 +- include/linux/sunrpc/debug.h | 6 +- include/linux/sysfs.h | 2 +- include/linux/vmstat.h | 6 +- include/math-emu/soft-fp.h | 4 +- include/net/ip_vs.h | 16 +-- include/net/switchdev.h | 2 +- include/sound/hdaudio.h | 6 +- ipc/util.h | 2 +- kernel/kprobes.c | 16 +-- kernel/sched/fair.c | 2 +- lib/bch.c | 2 +- mm/shmem.c | 2 +- net/8021q/vlanproc.h | 4 +- net/dccp/dccp.h | 6 +- net/netfilter/nfnetlink_queue.c | 4 +- net/rxrpc/ar-internal.h | 2 +- samples/connector/ucon.c | 2 +- scripts/checkpatch.pl | 6 +- security/selinux/avc.c | 2 +- sound/core/pcm.c | 2 +- sound/oss/sound_config.h | 2 +- sound/soc/au1x/dbdma2.c | 2 +- sound/soc/codecs/dbgprint.h | 8 +- techpack/audio/4.0/asoc/msm-qti-pp-config.h | 6 +- .../asoc/codecs/wcd934x/wcd934x-dsp-cntl.c | 2 +- techpack/audio/asoc/msm-qti-pp-config.h | 6 +- tools/perf/util/probe-file.h | 2 +- .../formal/srcu-cbmc/src/barriers.h | 4 +- tools/virtio/linux/kernel.h | 6 +- tools/virtio/virtio-trace/trace-agent.h | 2 +- virt/kvm/async_pf.h | 4 +- 215 files changed, 468 insertions(+), 468 deletions(-) diff --git a/arch/alpha/kernel/core_cia.c b/arch/alpha/kernel/core_cia.c index 4b38386f6e62..d797d154bc9b 100644 --- a/arch/alpha/kernel/core_cia.c +++ b/arch/alpha/kernel/core_cia.c @@ -622,8 +622,8 @@ cia_restore_srm_settings(void) mb(); } #else /* ALPHA_RESTORE_SRM_SETUP */ -#define cia_save_srm_settings(p) do {} while (0) -#define cia_restore_srm_settings() do {} while (0) +#define cia_save_srm_settings(p) ((void)0) +#define cia_restore_srm_settings() ((void)0) #endif /* ALPHA_RESTORE_SRM_SETUP */ diff --git a/arch/alpha/kernel/pci_impl.h b/arch/alpha/kernel/pci_impl.h index f332d88ffaff..cd019444c13b 100644 --- a/arch/alpha/kernel/pci_impl.h +++ b/arch/alpha/kernel/pci_impl.h @@ -167,8 +167,8 @@ struct pdev_srm_saved_conf extern void pci_restore_srm_config(void); #else -#define pdev_save_srm_config(dev) do {} while (0) -#define pci_restore_srm_config() do {} while (0) +#define pdev_save_srm_config(dev) ((void)0) +#define pci_restore_srm_config() ((void)0) #endif /* The hose list. */ diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index 8e30772cfe32..ca4cd7a0eb9a 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h @@ -61,7 +61,7 @@ extern u32 enable_off_mode; #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) extern void pm_dbg_update_time(struct powerdomain *pwrdm, int prev); #else -#define pm_dbg_update_time(pwrdm, prev) do {} while (0); +#define pm_dbg_update_time(pwrdm, prev) ((void)0); #endif /* CONFIG_PM_DEBUG */ /* 24xx */ diff --git a/arch/arm/mach-pxa/cm-x2xx-pci.h b/arch/arm/mach-pxa/cm-x2xx-pci.h index 93ffaaee75d7..a70e7270522d 100644 --- a/arch/arm/mach-pxa/cm-x2xx-pci.h +++ b/arch/arm/mach-pxa/cm-x2xx-pci.h @@ -8,7 +8,7 @@ extern void __cmx2xx_pci_resume(void); #define cmx2xx_pci_suspend(x) __cmx2xx_pci_suspend(x) #define cmx2xx_pci_resume(x) __cmx2xx_pci_resume(x) #else -#define cmx2xx_pci_init_irq(x) do {} while (0) -#define cmx2xx_pci_suspend(x) do {} while (0) -#define cmx2xx_pci_resume(x) do {} while (0) +#define cmx2xx_pci_init_irq(x) ((void)0) +#define cmx2xx_pci_suspend(x) ((void)0) +#define cmx2xx_pci_resume(x) ((void)0) #endif diff --git a/arch/arm/mach-pxa/palm27x.h b/arch/arm/mach-pxa/palm27x.h index d4eac3d6ffb5..df89bef88604 100644 --- a/arch/arm/mach-pxa/palm27x.h +++ b/arch/arm/mach-pxa/palm27x.h @@ -34,7 +34,7 @@ extern struct pxafb_mode_info palm_320x320_new_lcd_mode; extern void __init palm27x_lcd_init(int power, struct pxafb_mode_info *mode); #else -#define palm27x_lcd_init(power, mode) do {} while (0) +#define palm27x_lcd_init(power, mode) ((void)0) #endif #if defined(CONFIG_USB_PXA27X) || \ diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 1e460b4ee3b9..99f39937bd62 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -167,9 +167,9 @@ static inline void set_gdma_dev(int req, int dev) omap_writel(l, reg); } #else -#define set_gdma_dev(req, dev) do {} while (0) +#define set_gdma_dev(req, dev) ((void)0) #define omap_readl(reg) 0 -#define omap_writel(val, reg) do {} while (0) +#define omap_writel(val, reg) ((void)0) #endif #ifdef CONFIG_ARCH_OMAP1 diff --git a/arch/c6x/include/asm/cacheflush.h b/arch/c6x/include/asm/cacheflush.h index df5db90dbe56..36f2ca004eef 100644 --- a/arch/c6x/include/asm/cacheflush.h +++ b/arch/c6x/include/asm/cacheflush.h @@ -22,17 +22,17 @@ /* * virtually-indexed cache management (our cache is physically indexed) */ -#define flush_cache_all() do {} while (0) -#define flush_cache_mm(mm) do {} while (0) -#define flush_cache_dup_mm(mm) do {} while (0) -#define flush_cache_range(mm, start, end) do {} while (0) -#define flush_cache_page(vma, vmaddr, pfn) do {} while (0) -#define flush_cache_vmap(start, end) do {} while (0) -#define flush_cache_vunmap(start, end) do {} while (0) +#define flush_cache_all() ((void)0) +#define flush_cache_mm(mm) ((void)0) +#define flush_cache_dup_mm(mm) ((void)0) +#define flush_cache_range(mm, start, end) ((void)0) +#define flush_cache_page(vma, vmaddr, pfn) ((void)0) +#define flush_cache_vmap(start, end) ((void)0) +#define flush_cache_vunmap(start, end) ((void)0) #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0 -#define flush_dcache_page(page) do {} while (0) -#define flush_dcache_mmap_lock(mapping) do {} while (0) -#define flush_dcache_mmap_unlock(mapping) do {} while (0) +#define flush_dcache_page(page) ((void)0) +#define flush_dcache_mmap_lock(mapping) ((void)0) +#define flush_dcache_mmap_unlock(mapping) ((void)0) /* * physically-indexed cache management diff --git a/arch/cris/include/asm/fb.h b/arch/cris/include/asm/fb.h index e10150073c30..5589eb5a19f7 100644 --- a/arch/cris/include/asm/fb.h +++ b/arch/cris/include/asm/fb.h @@ -3,7 +3,7 @@ #define _ASM_FB_H_ #include -#define fb_pgprotect(...) do {} while (0) +#define fb_pgprotect(...) ((void)0) static inline int fb_is_primary_device(struct fb_info *info) { diff --git a/arch/frv/include/asm/pgtable.h b/arch/frv/include/asm/pgtable.h index ab6e7e961b54..76e932b35646 100644 --- a/arch/frv/include/asm/pgtable.h +++ b/arch/frv/include/asm/pgtable.h @@ -67,7 +67,7 @@ typedef pte_t *pte_addr_t; #define swapper_pg_dir ((pgd_t *) NULL) -#define pgtable_cache_init() do {} while (0) +#define pgtable_cache_init() ((void)0) #include diff --git a/arch/frv/include/asm/timex.h b/arch/frv/include/asm/timex.h index bf53166f2793..df5e9c63f52e 100644 --- a/arch/frv/include/asm/timex.h +++ b/arch/frv/include/asm/timex.h @@ -14,8 +14,8 @@ static inline cycles_t get_cycles(void) return 0; } -#define vxtime_lock() do {} while (0) -#define vxtime_unlock() do {} while (0) +#define vxtime_lock() ((void)0) +#define vxtime_unlock() ((void)0) /* This attribute is used in include/linux/jiffies.h alongside with * __cacheline_aligned_in_smp. It is assumed that __cacheline_aligned_in_smp diff --git a/arch/h8300/include/asm/pgtable.h b/arch/h8300/include/asm/pgtable.h index a99caa49d265..ee9253af8676 100644 --- a/arch/h8300/include/asm/pgtable.h +++ b/arch/h8300/include/asm/pgtable.h @@ -46,6 +46,6 @@ extern int is_in_rom(unsigned long); #define VMALLOC_START 0 #define VMALLOC_END 0xffffffff -#define arch_enter_lazy_cpu_mode() do {} while (0) +#define arch_enter_lazy_cpu_mode() ((void)0) #endif /* _H8300_PGTABLE_H */ diff --git a/arch/hexagon/include/asm/pgalloc.h b/arch/hexagon/include/asm/pgalloc.h index eeebf862c46c..ec3d40aa1a4d 100644 --- a/arch/hexagon/include/asm/pgalloc.h +++ b/arch/hexagon/include/asm/pgalloc.h @@ -24,7 +24,7 @@ #include #include -#define check_pgt_cache() do {} while (0) +#define check_pgt_cache() ((void)0) extern unsigned long long kmap_generation; diff --git a/arch/ia64/include/asm/irqflags.h b/arch/ia64/include/asm/irqflags.h index d97f8435be4f..e4c66d33e58b 100644 --- a/arch/ia64/include/asm/irqflags.h +++ b/arch/ia64/include/asm/irqflags.h @@ -22,7 +22,7 @@ static inline void arch_maybe_save_ip(unsigned long flags) last_cli_ip = ia64_getreg(_IA64_REG_IP); } #else -#define arch_maybe_save_ip(flags) do {} while (0) +#define arch_maybe_save_ip(flags) ((void)0) #endif /* diff --git a/arch/m68k/include/asm/fb.h b/arch/m68k/include/asm/fb.h index b86c6e2e26dd..84eb68c9a8dc 100644 --- a/arch/m68k/include/asm/fb.h +++ b/arch/m68k/include/asm/fb.h @@ -28,7 +28,7 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, } #endif /* CONFIG_SUN3 */ #else -#define fb_pgprotect(...) do {} while (0) +#define fb_pgprotect(...) ((void)0) #endif /* CONFIG_MMU */ static inline int fb_is_primary_device(struct fb_info *info) diff --git a/arch/m68k/include/asm/mcf_pgtable.h b/arch/m68k/include/asm/mcf_pgtable.h index 5d5502cb2b2d..1744f83d105e 100644 --- a/arch/m68k/include/asm/mcf_pgtable.h +++ b/arch/m68k/include/asm/mcf_pgtable.h @@ -162,7 +162,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) return pte; } -#define pmd_set(pmdp, ptep) do {} while (0) +#define pmd_set(pmdp, ptep) ((void)0) static inline void pgd_set(pgd_t *pgdp, pmd_t *pmdp) { diff --git a/arch/m68k/include/asm/sun3_pgtable.h b/arch/m68k/include/asm/sun3_pgtable.h index c987d50866b4..ea74b4249720 100644 --- a/arch/m68k/include/asm/sun3_pgtable.h +++ b/arch/m68k/include/asm/sun3_pgtable.h @@ -108,7 +108,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) return pte; } -#define pmd_set(pmdp,ptep) do {} while (0) +#define pmd_set(pmdp,ptep) ((void)0) static inline void pgd_set(pgd_t *pgdp, pmd_t *pmdp) { diff --git a/arch/metag/include/asm/cacheflush.h b/arch/metag/include/asm/cacheflush.h index 2584a51eca1a..360cb03f09d4 100644 --- a/arch/metag/include/asm/cacheflush.h +++ b/arch/metag/include/asm/cacheflush.h @@ -227,7 +227,7 @@ static inline void invalidate_dcache_region(void *start, unsigned long size) } #else #define flush_dcache_region(s, l) metag_data_cache_flush((s), (l)) -#define writeback_dcache_region(s, l) do {} while (0) +#define writeback_dcache_region(s, l) ((void)0) #define invalidate_dcache_region(s, l) flush_dcache_region((s), (l)) #endif diff --git a/arch/metag/include/asm/da.h b/arch/metag/include/asm/da.h index 901daa540e6e..39b46308b2f4 100644 --- a/arch/metag/include/asm/da.h +++ b/arch/metag/include/asm/da.h @@ -37,7 +37,7 @@ int __init metag_da_probe(void); #else /* !CONFIG_METAG_DA */ #define metag_da_enabled() false -#define metag_da_probe() do {} while (0) +#define metag_da_probe() ((void)0) #endif diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h index e53b8532353c..63b2c5f8253d 100644 --- a/arch/microblaze/include/asm/pgtable.h +++ b/arch/microblaze/include/asm/pgtable.h @@ -44,9 +44,9 @@ extern int mem_init_done; #define swapper_pg_dir ((pgd_t *) NULL) -#define pgtable_cache_init() do {} while (0) +#define pgtable_cache_init() ((void)0) -#define arch_enter_lazy_cpu_mode() do {} while (0) +#define arch_enter_lazy_cpu_mode() ((void)0) #define pgprot_noncached_wc(prot) prot diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c index 66096c766a60..d2d3a6d2f86b 100644 --- a/arch/mips/boot/compressed/decompress.c +++ b/arch/mips/boot/compressed/decompress.c @@ -36,8 +36,8 @@ extern unsigned char __image_begin, __image_end; extern void puts(const char *s); extern void puthex(unsigned long long val); #else -#define puts(s) do {} while (0) -#define puthex(val) do {} while (0) +#define puts(s) ((void)0) +#define puthex(val) ((void)0) #endif extern char __appended_dtb[]; diff --git a/arch/mips/include/asm/watch.h b/arch/mips/include/asm/watch.h index 6ffe3eadf105..4b3c88f2332d 100644 --- a/arch/mips/include/asm/watch.h +++ b/arch/mips/include/asm/watch.h @@ -26,7 +26,7 @@ void mips_probe_watch_registers(struct cpuinfo_mips *c); } while (0) #else -#define __restore_watch(task) do {} while (0) +#define __restore_watch(task) ((void)0) #endif #endif /* _ASM_WATCH_H */ diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 8451d1b10f72..84040a20117f 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -347,7 +347,7 @@ static unsigned long __init init_initrd(void) return 0; } -#define finalize_initrd() do {} while (0) +#define finalize_initrd() ((void)0) #endif diff --git a/arch/mips/pci/pci-alchemy.c b/arch/mips/pci/pci-alchemy.c index 4f2411f489af..85c2c9b2b847 100644 --- a/arch/mips/pci/pci-alchemy.c +++ b/arch/mips/pci/pci-alchemy.c @@ -25,7 +25,7 @@ #ifdef CONFIG_PCI_DEBUG #define DBG(x...) printk(KERN_DEBUG x) #else -#define DBG(x...) do {} while (0) +#define DBG(x...) ((void)0) #endif #define PCI_ACCESS_READ 0 diff --git a/arch/mn10300/include/asm/cacheflush.h b/arch/mn10300/include/asm/cacheflush.h index 6d6df839948f..63dbe4b9275b 100644 --- a/arch/mn10300/include/asm/cacheflush.h +++ b/arch/mn10300/include/asm/cacheflush.h @@ -54,10 +54,10 @@ extern void mn10300_dcache_flush_inv_page(unsigned long start); extern void mn10300_dcache_flush_inv_range(unsigned long start, unsigned long end); extern void mn10300_dcache_flush_inv_range2(unsigned long start, unsigned long size); #else -#define mn10300_local_dcache_flush() do {} while (0) -#define mn10300_local_dcache_flush_page(start) do {} while (0) -#define mn10300_local_dcache_flush_range(start, end) do {} while (0) -#define mn10300_local_dcache_flush_range2(start, size) do {} while (0) +#define mn10300_local_dcache_flush() ((void)0) +#define mn10300_local_dcache_flush_page(start) ((void)0) +#define mn10300_local_dcache_flush_range(start, end) ((void)0) +#define mn10300_local_dcache_flush_range2(start, size) ((void)0) #define mn10300_local_dcache_flush_inv() \ mn10300_local_dcache_inv() #define mn10300_local_dcache_flush_inv_page(start) \ @@ -66,10 +66,10 @@ extern void mn10300_dcache_flush_inv_range2(unsigned long start, unsigned long s mn10300_local_dcache_inv_range(start, end) #define mn10300_local_dcache_flush_inv_range2(start, size) \ mn10300_local_dcache_inv_range2(start, size) -#define mn10300_dcache_flush() do {} while (0) -#define mn10300_dcache_flush_page(start) do {} while (0) -#define mn10300_dcache_flush_range(start, end) do {} while (0) -#define mn10300_dcache_flush_range2(start, size) do {} while (0) +#define mn10300_dcache_flush() ((void)0) +#define mn10300_dcache_flush_page(start) ((void)0) +#define mn10300_dcache_flush_range(start, end) ((void)0) +#define mn10300_dcache_flush_range2(start, size) ((void)0) #define mn10300_dcache_flush_inv() mn10300_dcache_inv() #define mn10300_dcache_flush_inv_page(start) \ mn10300_dcache_inv_page((start)) @@ -79,54 +79,54 @@ extern void mn10300_dcache_flush_inv_range2(unsigned long start, unsigned long s mn10300_dcache_inv_range2((start), (size)) #endif /* CONFIG_MN10300_CACHE_WBACK */ #else -#define mn10300_local_icache_inv() do {} while (0) -#define mn10300_local_icache_inv_page(start) do {} while (0) -#define mn10300_local_icache_inv_range(start, end) do {} while (0) -#define mn10300_local_icache_inv_range2(start, size) do {} while (0) -#define mn10300_local_dcache_inv() do {} while (0) -#define mn10300_local_dcache_inv_page(start) do {} while (0) -#define mn10300_local_dcache_inv_range(start, end) do {} while (0) -#define mn10300_local_dcache_inv_range2(start, size) do {} while (0) -#define mn10300_local_dcache_flush() do {} while (0) -#define mn10300_local_dcache_flush_inv_page(start) do {} while (0) -#define mn10300_local_dcache_flush_inv() do {} while (0) -#define mn10300_local_dcache_flush_inv_range(start, end)do {} while (0) -#define mn10300_local_dcache_flush_inv_range2(start, size) do {} while (0) -#define mn10300_local_dcache_flush_page(start) do {} while (0) -#define mn10300_local_dcache_flush_range(start, end) do {} while (0) -#define mn10300_local_dcache_flush_range2(start, size) do {} while (0) -#define mn10300_icache_inv() do {} while (0) -#define mn10300_icache_inv_page(start) do {} while (0) -#define mn10300_icache_inv_range(start, end) do {} while (0) -#define mn10300_icache_inv_range2(start, size) do {} while (0) -#define mn10300_dcache_inv() do {} while (0) -#define mn10300_dcache_inv_page(start) do {} while (0) -#define mn10300_dcache_inv_range(start, end) do {} while (0) -#define mn10300_dcache_inv_range2(start, size) do {} while (0) -#define mn10300_dcache_flush() do {} while (0) -#define mn10300_dcache_flush_inv_page(start) do {} while (0) -#define mn10300_dcache_flush_inv() do {} while (0) -#define mn10300_dcache_flush_inv_range(start, end) do {} while (0) -#define mn10300_dcache_flush_inv_range2(start, size) do {} while (0) -#define mn10300_dcache_flush_page(start) do {} while (0) -#define mn10300_dcache_flush_range(start, end) do {} while (0) -#define mn10300_dcache_flush_range2(start, size) do {} while (0) +#define mn10300_local_icache_inv() ((void)0) +#define mn10300_local_icache_inv_page(start) ((void)0) +#define mn10300_local_icache_inv_range(start, end) ((void)0) +#define mn10300_local_icache_inv_range2(start, size) ((void)0) +#define mn10300_local_dcache_inv() ((void)0) +#define mn10300_local_dcache_inv_page(start) ((void)0) +#define mn10300_local_dcache_inv_range(start, end) ((void)0) +#define mn10300_local_dcache_inv_range2(start, size) ((void)0) +#define mn10300_local_dcache_flush() ((void)0) +#define mn10300_local_dcache_flush_inv_page(start) ((void)0) +#define mn10300_local_dcache_flush_inv() ((void)0) +#define mn10300_local_dcache_flush_inv_range(start, end)((void)0) +#define mn10300_local_dcache_flush_inv_range2(start, size) ((void)0) +#define mn10300_local_dcache_flush_page(start) ((void)0) +#define mn10300_local_dcache_flush_range(start, end) ((void)0) +#define mn10300_local_dcache_flush_range2(start, size) ((void)0) +#define mn10300_icache_inv() ((void)0) +#define mn10300_icache_inv_page(start) ((void)0) +#define mn10300_icache_inv_range(start, end) ((void)0) +#define mn10300_icache_inv_range2(start, size) ((void)0) +#define mn10300_dcache_inv() ((void)0) +#define mn10300_dcache_inv_page(start) ((void)0) +#define mn10300_dcache_inv_range(start, end) ((void)0) +#define mn10300_dcache_inv_range2(start, size) ((void)0) +#define mn10300_dcache_flush() ((void)0) +#define mn10300_dcache_flush_inv_page(start) ((void)0) +#define mn10300_dcache_flush_inv() ((void)0) +#define mn10300_dcache_flush_inv_range(start, end) ((void)0) +#define mn10300_dcache_flush_inv_range2(start, size) ((void)0) +#define mn10300_dcache_flush_page(start) ((void)0) +#define mn10300_dcache_flush_range(start, end) ((void)0) +#define mn10300_dcache_flush_range2(start, size) ((void)0) #endif /* CONFIG_MN10300_CACHE_ENABLED */ /* * Virtually-indexed cache management (our cache is physically indexed) */ -#define flush_cache_all() do {} while (0) -#define flush_cache_mm(mm) do {} while (0) -#define flush_cache_dup_mm(mm) do {} while (0) -#define flush_cache_range(mm, start, end) do {} while (0) -#define flush_cache_page(vma, vmaddr, pfn) do {} while (0) -#define flush_cache_vmap(start, end) do {} while (0) -#define flush_cache_vunmap(start, end) do {} while (0) +#define flush_cache_all() ((void)0) +#define flush_cache_mm(mm) ((void)0) +#define flush_cache_dup_mm(mm) ((void)0) +#define flush_cache_range(mm, start, end) ((void)0) +#define flush_cache_page(vma, vmaddr, pfn) ((void)0) +#define flush_cache_vmap(start, end) ((void)0) +#define flush_cache_vunmap(start, end) ((void)0) #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0 -#define flush_dcache_page(page) do {} while (0) -#define flush_dcache_mmap_lock(mapping) do {} while (0) -#define flush_dcache_mmap_unlock(mapping) do {} while (0) +#define flush_dcache_page(page) ((void)0) +#define flush_dcache_mmap_lock(mapping) ((void)0) +#define flush_dcache_mmap_unlock(mapping) ((void)0) /* * Physically-indexed cache management @@ -142,8 +142,8 @@ static inline void flush_icache_page(struct vm_area_struct *vma, } extern void flush_icache_range(unsigned long start, unsigned long end); #else -#define flush_icache_range(start, end) do {} while (0) -#define flush_icache_page(vma, pg) do {} while (0) +#define flush_icache_range(start, end) ((void)0) +#define flush_icache_page(vma, pg) ((void)0) #endif diff --git a/arch/mn10300/include/asm/gdb-stub.h b/arch/mn10300/include/asm/gdb-stub.h index f5495ad82b77..0e4678764160 100644 --- a/arch/mn10300/include/asm/gdb-stub.h +++ b/arch/mn10300/include/asm/gdb-stub.h @@ -113,7 +113,7 @@ extern asmlinkage void __gdbstub_pause(void); #ifdef CONFIG_MN10300_CACHE_ENABLED extern asmlinkage void gdbstub_purge_cache(void); #else -#define gdbstub_purge_cache() do {} while (0) +#define gdbstub_purge_cache() ((void)0) #endif /* Used to prevent crashes in memory access */ diff --git a/arch/mn10300/include/asm/io.h b/arch/mn10300/include/asm/io.h index 62189353d2f6..2cc6a3112466 100644 --- a/arch/mn10300/include/asm/io.h +++ b/arch/mn10300/include/asm/io.h @@ -16,7 +16,7 @@ #include #include -#define mmiowb() do {} while (0) +#define mmiowb() ((void)0) /*****************************************************************************/ /* diff --git a/arch/mn10300/include/asm/kprobes.h b/arch/mn10300/include/asm/kprobes.h index 7abea0bdb549..7bd65110b52f 100644 --- a/arch/mn10300/include/asm/kprobes.h +++ b/arch/mn10300/include/asm/kprobes.h @@ -47,7 +47,7 @@ extern const int kretprobe_blacklist_size; extern int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *data); -#define flush_insn_slot(p) do {} while (0) +#define flush_insn_slot(p) ((void)0) extern void arch_remove_kprobe(struct kprobe *p); diff --git a/arch/mn10300/include/asm/mmu_context.h b/arch/mn10300/include/asm/mmu_context.h index d2034f5e6eda..e3303564299a 100644 --- a/arch/mn10300/include/asm/mmu_context.h +++ b/arch/mn10300/include/asm/mmu_context.h @@ -36,7 +36,7 @@ #define MMU_NO_CONTEXT 0x00000000UL #define MMU_CONTEXT_TLBPID_LOCK_NR 0 -#define enter_lazy_tlb(mm, tsk) do {} while (0) +#define enter_lazy_tlb(mm, tsk) ((void)0) static inline void cpu_ran_vm(int cpu, struct mm_struct *mm) { @@ -134,7 +134,7 @@ static inline void activate_context(struct mm_struct *mm) * Destroy context related info for an mm_struct that is about to be put to * rest */ -#define destroy_context(mm) do {} while (0) +#define destroy_context(mm) ((void)0) /** * switch_mm - Change between userspace virtual memory contexts @@ -157,7 +157,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, } } -#define deactivate_mm(tsk, mm) do {} while (0) +#define deactivate_mm(tsk, mm) ((void)0) #define activate_mm(prev, next) switch_mm((prev), (next), NULL) #endif /* _ASM_MMU_CONTEXT_H */ diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h index d27654902f28..a943a0a63e7f 100644 --- a/arch/mn10300/include/asm/pci.h +++ b/arch/mn10300/include/asm/pci.h @@ -29,8 +29,8 @@ do { \ } while (0) #else -#define __pcbdebug(FMT, ADDR, ...) do {} while (0) -#define __pcidebug(FMT, BUS, DEVFN, WHERE, ...) do {} while (0) +#define __pcbdebug(FMT, ADDR, ...) ((void)0) +#define __pcidebug(FMT, BUS, DEVFN, WHERE, ...) ((void)0) #endif /* Can be used to override the logic in pci_scan_bus for skipping diff --git a/arch/mn10300/include/asm/pgtable.h b/arch/mn10300/include/asm/pgtable.h index 96d3f9deb59c..4825c97423e0 100644 --- a/arch/mn10300/include/asm/pgtable.h +++ b/arch/mn10300/include/asm/pgtable.h @@ -464,7 +464,7 @@ static inline int set_kernel_exec(unsigned long vaddr, int enable) #define pte_offset_map(dir, address) \ ((pte_t *) page_address(pmd_page(*(dir))) + pte_index(address)) -#define pte_unmap(pte) do {} while (0) +#define pte_unmap(pte) ((void)0) /* * The MN10300 has external MMU info in the form of a TLB: this is adapted from diff --git a/arch/mn10300/include/asm/switch_to.h b/arch/mn10300/include/asm/switch_to.h index 67e333aa7629..bdbdfe1ffc0c 100644 --- a/arch/mn10300/include/asm/switch_to.h +++ b/arch/mn10300/include/asm/switch_to.h @@ -28,7 +28,7 @@ extern asmlinkage void fpu_save(struct fpu_state_struct *); } \ } while (0) #else -#define switch_fpu(prev, next) do {} while (0) +#define switch_fpu(prev, next) ((void)0) #endif /* context switching is now performed out-of-line in switch_to.S */ diff --git a/arch/mn10300/kernel/smp.c b/arch/mn10300/kernel/smp.c index 35d2c3fe6f76..550cfd75940d 100644 --- a/arch/mn10300/kernel/smp.c +++ b/arch/mn10300/kernel/smp.c @@ -1049,9 +1049,9 @@ static inline void hotplug_cpu_invalidate_cache(void) } #else /* CONFIG_MN10300_CACHE_ENABLED */ -#define hotplug_cpu_disable_cache() do {} while (0) -#define hotplug_cpu_enable_cache() do {} while (0) -#define hotplug_cpu_invalidate_cache() do {} while (0) +#define hotplug_cpu_disable_cache() ((void)0) +#define hotplug_cpu_enable_cache() ((void)0) +#define hotplug_cpu_invalidate_cache() ((void)0) #endif /* CONFIG_MN10300_CACHE_ENABLED */ /** diff --git a/arch/mn10300/mm/misalignment.c b/arch/mn10300/mm/misalignment.c index 8ace89617c1c..5ef600c66ea0 100644 --- a/arch/mn10300/mm/misalignment.c +++ b/arch/mn10300/mm/misalignment.c @@ -37,7 +37,7 @@ #if 0 #define kdebug(FMT, ...) printk(KERN_DEBUG "MISALIGN: "FMT"\n", ##__VA_ARGS__) #else -#define kdebug(FMT, ...) do {} while (0) +#define kdebug(FMT, ...) ((void)0) #endif static int misalignment_addr(unsigned long *registers, unsigned long sp, diff --git a/arch/mn10300/unit-asb2364/include/unit/leds.h b/arch/mn10300/unit-asb2364/include/unit/leds.h index 03a3933ad323..518f65bc97dc 100644 --- a/arch/mn10300/unit-asb2364/include/unit/leds.h +++ b/arch/mn10300/unit-asb2364/include/unit/leds.h @@ -31,7 +31,7 @@ ASB2364_7SEGLEDS = (ONOFF) ? 0x8543077f : 0x7f7f7f7f; \ } while (0) #else -#define mn10300_set_gdbleds(ONOFF) do {} while (0) +#define mn10300_set_gdbleds(ONOFF) ((void)0) #endif #if MN10300_USE_7SEGLEDS diff --git a/arch/powerpc/include/asm/book3s/64/tlbflush-hash.h b/arch/powerpc/include/asm/book3s/64/tlbflush-hash.h index 42178897a050..8a53f823d2ce 100644 --- a/arch/powerpc/include/asm/book3s/64/tlbflush-hash.h +++ b/arch/powerpc/include/asm/book3s/64/tlbflush-hash.h @@ -49,7 +49,7 @@ static inline void arch_leave_lazy_mmu_mode(void) batch->active = 0; } -#define arch_flush_lazy_mmu_mode() do {} while (0) +#define arch_flush_lazy_mmu_mode() ((void)0) extern void flush_hash_page(unsigned long vpn, real_pte_t pte, int psize, diff --git a/arch/powerpc/include/asm/dcr-native.h b/arch/powerpc/include/asm/dcr-native.h index 86fdda16bb73..79b9f3ec72b9 100644 --- a/arch/powerpc/include/asm/dcr-native.h +++ b/arch/powerpc/include/asm/dcr-native.h @@ -37,7 +37,7 @@ static inline bool dcr_map_ok_native(dcr_host_native_t host) #define dcr_map_native(dev, dcr_n, dcr_c) \ ((dcr_host_native_t){ .base = (dcr_n) }) -#define dcr_unmap_native(host, dcr_c) do {} while (0) +#define dcr_unmap_native(host, dcr_c) ((void)0) #define dcr_read_native(host, dcr_n) mfdcr(dcr_n + host.base) #define dcr_write_native(host, dcr_n, value) mtdcr(dcr_n + host.base, value) diff --git a/arch/powerpc/include/asm/fs_pd.h b/arch/powerpc/include/asm/fs_pd.h index 8def56ec05c6..c119fa08b3c4 100644 --- a/arch/powerpc/include/asm/fs_pd.h +++ b/arch/powerpc/include/asm/fs_pd.h @@ -33,7 +33,7 @@ extern immap_t __iomem *mpc8xx_immr; #define immr_map(member) (&mpc8xx_immr->member) #define immr_map_size(member, size) (&mpc8xx_immr->member) -#define immr_unmap(addr) do {} while (0) +#define immr_unmap(addr) ((void)0) #endif static inline int uart_baudrate(void) diff --git a/arch/powerpc/platforms/83xx/mpc83xx.h b/arch/powerpc/platforms/83xx/mpc83xx.h index 459145623334..4586f88bfab0 100644 --- a/arch/powerpc/platforms/83xx/mpc83xx.h +++ b/arch/powerpc/platforms/83xx/mpc83xx.h @@ -83,7 +83,7 @@ static inline void __init mpc83xx_qe_init_IRQ(void) {} #ifdef CONFIG_PCI extern void mpc83xx_setup_pci(void); #else -#define mpc83xx_setup_pci() do {} while (0) +#define mpc83xx_setup_pci() ((void)0) #endif extern int mpc83xx_declare_of_platform_devices(void); diff --git a/arch/score/include/asm/cacheflush.h b/arch/score/include/asm/cacheflush.h index cf1e609634fd..ac05033371d9 100644 --- a/arch/score/include/asm/cacheflush.h +++ b/arch/score/include/asm/cacheflush.h @@ -19,12 +19,12 @@ extern void flush_dcache_page(struct page *page); #define PG_dcache_dirty PG_arch_1 -#define flush_cache_dup_mm(mm) do {} while (0) +#define flush_cache_dup_mm(mm) ((void)0) #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0 -#define flush_dcache_mmap_lock(mapping) do {} while (0) -#define flush_dcache_mmap_unlock(mapping) do {} while (0) -#define flush_cache_vmap(start, end) do {} while (0) -#define flush_cache_vunmap(start, end) do {} while (0) +#define flush_dcache_mmap_lock(mapping) ((void)0) +#define flush_dcache_mmap_unlock(mapping) ((void)0) +#define flush_cache_vmap(start, end) ((void)0) +#define flush_cache_vunmap(start, end) ((void)0) static inline void flush_icache_page(struct vm_area_struct *vma, struct page *page) diff --git a/arch/score/include/asm/pgalloc.h b/arch/score/include/asm/pgalloc.h index 7dfc5c163093..1d890dc50785 100644 --- a/arch/score/include/asm/pgalloc.h +++ b/arch/score/include/asm/pgalloc.h @@ -81,6 +81,6 @@ do { \ tlb_remove_page((tlb), pte); \ } while (0) -#define check_pgt_cache() do {} while (0) +#define check_pgt_cache() ((void)0) #endif /* _ASM_SCORE_PGALLOC_H */ diff --git a/arch/score/include/asm/pgtable.h b/arch/score/include/asm/pgtable.h index c14226be0559..f6b708ffbb86 100644 --- a/arch/score/include/asm/pgtable.h +++ b/arch/score/include/asm/pgtable.h @@ -172,9 +172,9 @@ extern unsigned long zero_page_mask; (virt_to_page((void *)(empty_zero_page + \ (((unsigned long)(vaddr)) & zero_page_mask)))) -#define pgtable_cache_init() do {} while (0) +#define pgtable_cache_init() ((void)0) -#define arch_enter_lazy_cpu_mode() do {} while (0) +#define arch_enter_lazy_cpu_mode() ((void)0) static inline int pte_write(pte_t pte) { diff --git a/arch/score/include/asm/processor.h b/arch/score/include/asm/processor.h index 1412c774c6b1..e2ac01820143 100644 --- a/arch/score/include/asm/processor.h +++ b/arch/score/include/asm/processor.h @@ -24,7 +24,7 @@ extern unsigned long get_wchan(struct task_struct *p); #define current_text_addr() ({ __label__ _l; _l: &&_l; }) #define cpu_relax() barrier() -#define release_thread(thread) do {} while (0) +#define release_thread(thread) ((void)0) /* * User space process size: 2GB. This is hardcoded into a few places, diff --git a/arch/score/include/asm/tlb.h b/arch/score/include/asm/tlb.h index 6e7206428877..d763efb046df 100644 --- a/arch/score/include/asm/tlb.h +++ b/arch/score/include/asm/tlb.h @@ -6,9 +6,9 @@ * SCORE doesn't need any special per-pte or per-vma handling, except * we need to flush cache for area to be unmapped. */ -#define tlb_start_vma(tlb, vma) do {} while (0) -#define tlb_end_vma(tlb, vma) do {} while (0) -#define __tlb_remove_tlb_entry(tlb, ptep, address) do {} while (0) +#define tlb_start_vma(tlb, vma) ((void)0) +#define tlb_end_vma(tlb, vma) ((void)0) +#define __tlb_remove_tlb_entry(tlb, ptep, address) ((void)0) #define tlb_flush(tlb) flush_tlb_mm((tlb)->mm) extern void score7_FTLB_refill_Handler(void); diff --git a/arch/sparc/include/asm/kprobes.h b/arch/sparc/include/asm/kprobes.h index 3704490b4488..f06abf29c215 100644 --- a/arch/sparc/include/asm/kprobes.h +++ b/arch/sparc/include/asm/kprobes.h @@ -17,7 +17,7 @@ typedef u32 kprobe_opcode_t; #define kretprobe_blacklist_size 0 -#define arch_remove_kprobe(p) do {} while (0) +#define arch_remove_kprobe(p) ((void)0) #define flush_insn_slot(p) \ do { flushi(&(p)->ainsn.insn[0]); \ diff --git a/arch/sparc/include/asm/tlbflush_64.h b/arch/sparc/include/asm/tlbflush_64.h index 8b8cdaa69272..918e354aa8c8 100644 --- a/arch/sparc/include/asm/tlbflush_64.h +++ b/arch/sparc/include/asm/tlbflush_64.h @@ -44,7 +44,7 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end); void flush_tlb_pending(void); void arch_enter_lazy_mmu_mode(void); void arch_leave_lazy_mmu_mode(void); -#define arch_flush_lazy_mmu_mode() do {} while (0) +#define arch_flush_lazy_mmu_mode() ((void)0) /* Local cpu only. */ void __flush_tlb_all(void); diff --git a/arch/sparc/kernel/cpumap.h b/arch/sparc/kernel/cpumap.h index 7d5b774862e7..57d6c7132c90 100644 --- a/arch/sparc/kernel/cpumap.h +++ b/arch/sparc/kernel/cpumap.h @@ -7,7 +7,7 @@ void cpu_map_rebuild(void); int map_to_cpu(unsigned int index); #define cpu_map_init() cpu_map_rebuild() #else -#define cpu_map_init() do {} while (0) +#define cpu_map_init() ((void)0) static inline int map_to_cpu(unsigned int index) { return raw_smp_processor_id(); diff --git a/arch/tile/include/asm/homecache.h b/arch/tile/include/asm/homecache.h index 7ddd1b8d6910..9a0ea9c96a90 100644 --- a/arch/tile/include/asm/homecache.h +++ b/arch/tile/include/asm/homecache.h @@ -114,10 +114,10 @@ void homecache_free_pages(unsigned long addr, unsigned int order); */ extern int page_home(struct page *); -#define homecache_migrate_kthread() do {} while (0) +#define homecache_migrate_kthread() ((void)0) #define homecache_kpte_lock() 0 -#define homecache_kpte_unlock(flags) do {} while (0) +#define homecache_kpte_unlock(flags) ((void)0) #endif /* _ASM_TILE_HOMECACHE_H */ diff --git a/arch/um/include/asm/tlb.h b/arch/um/include/asm/tlb.h index 02e61f6abfca..60e83ec2cb67 100644 --- a/arch/um/include/asm/tlb.h +++ b/arch/um/include/asm/tlb.h @@ -170,6 +170,6 @@ static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb, #define pmd_free_tlb(tlb, pmdp, addr) __pmd_free_tlb(tlb, pmdp, addr) -#define tlb_migrate_finish(mm) do {} while (0) +#define tlb_migrate_finish(mm) ((void)0) #endif diff --git a/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h b/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h index 13590ccf965c..99f63c86ece6 100644 --- a/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h +++ b/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h @@ -108,7 +108,7 @@ do { \ } \ } while (0) #else -#define assert(expr) do {} while (0) +#define assert(expr) ((void)0) #endif struct sha1_ctx_mgr { diff --git a/arch/x86/crypto/sha256-mb/sha256_mb_ctx.h b/arch/x86/crypto/sha256-mb/sha256_mb_ctx.h index aabb30320af0..970c2181b90b 100644 --- a/arch/x86/crypto/sha256-mb/sha256_mb_ctx.h +++ b/arch/x86/crypto/sha256-mb/sha256_mb_ctx.h @@ -108,7 +108,7 @@ do { \ } \ } while (0) #else -#define assert(expr) do {} while (0) +#define assert(expr) ((void)0) #endif struct sha256_ctx_mgr { diff --git a/arch/x86/crypto/sha512-mb/sha512_mb_ctx.h b/arch/x86/crypto/sha512-mb/sha512_mb_ctx.h index e4653f5eec3f..8290eb48c353 100644 --- a/arch/x86/crypto/sha512-mb/sha512_mb_ctx.h +++ b/arch/x86/crypto/sha512-mb/sha512_mb_ctx.h @@ -102,7 +102,7 @@ do { \ } \ } while (0) #else -#define assert(expr) do {} while (0) +#define assert(expr) ((void)0) #endif struct sha512_ctx_mgr { diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h index ec51eee2fe3f..594dfee01dd5 100644 --- a/arch/x86/include/asm/kvm_para.h +++ b/arch/x86/include/asm/kvm_para.h @@ -103,7 +103,7 @@ static inline void kvm_spinlock_init(void) #endif /* CONFIG_PARAVIRT_SPINLOCKS */ #else /* CONFIG_KVM_GUEST */ -#define kvm_guest_init() do {} while (0) +#define kvm_guest_init() ((void)0) #define kvm_async_pf_task_wait(T, I) do {} while(0) #define kvm_async_pf_task_wake(T) do {} while(0) diff --git a/arch/x86/include/asm/mc146818rtc.h b/arch/x86/include/asm/mc146818rtc.h index 1775a32f7ea6..e07946ba6fb6 100644 --- a/arch/x86/include/asm/mc146818rtc.h +++ b/arch/x86/include/asm/mc146818rtc.h @@ -78,8 +78,8 @@ static inline unsigned char current_lock_cmos_reg(void) local_irq_restore(cmos_flags); \ } while (0) #else -#define lock_cmos_prefix(reg) do {} while (0) -#define lock_cmos_suffix(reg) do {} while (0) +#define lock_cmos_prefix(reg) ((void)0) +#define lock_cmos_suffix(reg) ((void)0) #define lock_cmos(reg) do { } while (0) #define unlock_cmos() do { } while (0) #define do_i_have_lock_cmos() 0 diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h index dbff1456d215..3952775e6efa 100644 --- a/arch/x86/include/asm/mtrr.h +++ b/arch/x86/include/asm/mtrr.h @@ -57,8 +57,8 @@ static inline u8 mtrr_type_lookup(u64 addr, u64 end, u8 *uniform) */ return MTRR_TYPE_INVALID; } -#define mtrr_save_fixed_ranges(arg) do {} while (0) -#define mtrr_save_state() do {} while (0) +#define mtrr_save_fixed_ranges(arg) ((void)0) +#define mtrr_save_state() ((void)0) static inline int mtrr_add(unsigned long base, unsigned long size, unsigned int type, bool increment) { @@ -89,10 +89,10 @@ static inline void mtrr_bp_init(void) pat_disable("MTRRs disabled, skipping PAT initialization too."); } -#define mtrr_ap_init() do {} while (0) -#define set_mtrr_aps_delayed_init() do {} while (0) -#define mtrr_aps_init() do {} while (0) -#define mtrr_bp_restore() do {} while (0) +#define mtrr_ap_init() ((void)0) +#define set_mtrr_aps_delayed_init() ((void)0) +#define mtrr_aps_init() ((void)0) +#define mtrr_bp_restore() ((void)0) # endif #ifdef CONFIG_COMPAT diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index 917840ed5fe4..23d8096ce307 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c @@ -110,7 +110,7 @@ static void __init vmware_paravirt_ops_setup(void) vmware_sched_clock_setup(); } #else -#define vmware_paravirt_ops_setup() do {} while (0) +#define vmware_paravirt_ops_setup() ((void)0) #endif /* diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 2c12ae71aa49..9fed434474a5 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -55,7 +55,7 @@ #define PRIo64 "o" /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */ -#define apic_debug(fmt, arg...) do {} while (0) +#define apic_debug(fmt, arg...) ((void)0) /* 14 is the version for Xeon and Pentium 8.4.8*/ #define APIC_VERSION (0x14UL | ((KVM_APIC_LVT_NUM - 1) << 16)) diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 624cb9b996ef..5704c13470c4 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -963,7 +963,7 @@ struct bfq_group *bfqq_group(struct bfq_queue *bfqq); blk_add_trace_msg((bfqd)->queue, "bfq%d%c " fmt, (bfqq)->pid, \ bfq_bfqq_sync((bfqq)) ? 'S' : 'A', \ ##args) -#define bfq_log_bfqg(bfqd, bfqg, fmt, args...) do {} while (0) +#define bfq_log_bfqg(bfqd, bfqg, fmt, args...) ((void)0) #endif /* CONFIG_BFQ_GROUP_IOSCHED */ diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index ada1727182be..b789cf3f1388 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -799,7 +799,7 @@ static inline void cfqg_put(struct cfq_group *cfqg) { } cfq_cfqq_sync((cfqq)) ? 'S' : 'A', \ cfqq_type((cfqq)) == SYNC_NOIDLE_WORKLOAD ? 'N' : ' ',\ ##args) -#define cfq_log_cfqg(cfqd, cfqg, fmt, args...) do {} while (0) +#define cfq_log_cfqg(cfqd, cfqg, fmt, args...) ((void)0) static inline void cfqg_stats_update_io_add(struct cfq_group *cfqg, struct cfq_group *curr_cfqg, unsigned int op) { } diff --git a/block/partitions/ldm.c b/block/partitions/ldm.c index 2a365c756648..58938ac1fd51 100644 --- a/block/partitions/ldm.c +++ b/block/partitions/ldm.c @@ -42,7 +42,7 @@ * driver was compiled with debug enabled. Otherwise, the call turns into a NOP. */ #ifndef CONFIG_LDM_DEBUG -#define ldm_debug(...) do {} while (0) +#define ldm_debug(...) ((void)0) #else #define ldm_debug(f, a...) _ldm_printk (KERN_DEBUG, __func__, f, ##a) #endif diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c index 0a1ad1a1d34f..353dc8774f32 100644 --- a/drivers/atm/fore200e.c +++ b/drivers/atm/fore200e.c @@ -81,7 +81,7 @@ #define DPRINTK(level, format, args...) do { if (CONFIG_ATM_FORE200E_DEBUG >= (level)) \ printk(FORE200E format, ##args); } while (0) #else -#define DPRINTK(level, format, args...) do {} while (0) +#define DPRINTK(level, format, args...) ((void)0) #endif @@ -101,7 +101,7 @@ panic(FORE200E "%s", __func__); \ } #else -#define ASSERT(expr) do {} while (0) +#define ASSERT(expr) ((void)0) #endif diff --git a/drivers/base/devres.c b/drivers/base/devres.c index 529ed8e872cc..d1313c1be3b0 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -61,8 +61,8 @@ static void devres_log(struct device *dev, struct devres_node *node, op, node, node->name, (unsigned long)node->size); } #else /* CONFIG_DEBUG_DEVRES */ -#define set_node_dbginfo(node, n, s) do {} while (0) -#define devres_log(dev, node, op) do {} while (0) +#define set_node_dbginfo(node, n, s) ((void)0) +#define devres_log(dev, node, op) ((void)0) #endif /* CONFIG_DEBUG_DEVRES */ /* diff --git a/drivers/crypto/bcm/util.h b/drivers/crypto/bcm/util.h index 712e029795f8..edf5a06ee505 100644 --- a/drivers/crypto/bcm/util.h +++ b/drivers/crypto/bcm/util.h @@ -69,12 +69,12 @@ void __dump_sg(struct scatterlist *sg, unsigned int skip, unsigned int len); #else /* !DEBUG_ON */ -#define flow_log(...) do {} while (0) -#define flow_dump(msg, var, var_len) do {} while (0) -#define packet_log(...) do {} while (0) -#define packet_dump(msg, var, var_len) do {} while (0) +#define flow_log(...) ((void)0) +#define flow_dump(msg, var, var_len) ((void)0) +#define packet_log(...) ((void)0) +#define packet_dump(msg, var, var_len) ((void)0) -#define dump_sg(sg, skip, len) do {} while (0) +#define dump_sg(sg, skip, len) ((void)0) #endif /* DEBUG_ON */ diff --git a/drivers/crypto/nx/nx.h b/drivers/crypto/nx/nx.h index ebad937a9545..0af835db44e9 100644 --- a/drivers/crypto/nx/nx.h +++ b/drivers/crypto/nx/nx.h @@ -180,8 +180,8 @@ struct nx_sg *nx_walk_and_build(struct nx_sg *, unsigned int, int nx_debugfs_init(struct nx_crypto_driver *); void nx_debugfs_fini(struct nx_crypto_driver *); #else -#define NX_DEBUGFS_INIT(drv) do {} while (0) -#define NX_DEBUGFS_FINI(drv) do {} while (0) +#define NX_DEBUGFS_INIT(drv) ((void)0) +#define NX_DEBUGFS_FINI(drv) ((void)0) #endif #define NX_PAGE_NUM(x) ((u64)(x) & 0xfffffffffffff000ULL) diff --git a/drivers/crypto/qat/qat_common/adf_transport_internal.h b/drivers/crypto/qat/qat_common/adf_transport_internal.h index bb883368ac01..ee92d78cee55 100644 --- a/drivers/crypto/qat/qat_common/adf_transport_internal.h +++ b/drivers/crypto/qat/qat_common/adf_transport_internal.h @@ -104,7 +104,7 @@ static inline int adf_bank_debugfs_add(struct adf_etr_bank_data *bank) return 0; } -#define adf_bank_debugfs_rm(bank) do {} while (0) +#define adf_bank_debugfs_rm(bank) ((void)0) static inline int adf_ring_debugfs_add(struct adf_etr_ring_data *ring, const char *name) @@ -112,6 +112,6 @@ static inline int adf_ring_debugfs_add(struct adf_etr_ring_data *ring, return 0; } -#define adf_ring_debugfs_rm(ring) do {} while (0) +#define adf_ring_debugfs_rm(ring) ((void)0) #endif #endif diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index fe07f7316c75..004310637f88 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -260,8 +260,8 @@ static unsigned cmd_line; } while (0) #define PL330_DBGMC_START(addr) (cmd_line = addr) #else -#define PL330_DBGCMD_DUMP(off, x...) do {} while (0) -#define PL330_DBGMC_START(addr) do {} while (0) +#define PL330_DBGCMD_DUMP(off, x...) ((void)0) +#define PL330_DBGMC_START(addr) ((void)0) #endif /* The number of default descriptors */ diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c index ff94e58845b7..7fbc28b57610 100644 --- a/drivers/hwtracing/coresight/coresight-catu.c +++ b/drivers/hwtracing/coresight/coresight-catu.c @@ -25,7 +25,7 @@ #ifdef CATU_DEBUG #define catu_dbg(x, ...) dev_dbg(x, __VA_ARGS__) #else -#define catu_dbg(x, ...) do {} while (0) +#define catu_dbg(x, ...) ((void)0) #endif struct catu_etr_buf { diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c index 1147bddb8b2c..efea874509ed 100644 --- a/drivers/i2c/algos/i2c-algo-bit.c +++ b/drivers/i2c/algos/i2c-algo-bit.c @@ -36,7 +36,7 @@ } while (0) #else #define bit_dbg(level, dev, format, args...) \ - do {} while (0) + ((void)0) #endif /* DEBUG */ /* ----- global variables --------------------------------------------- */ diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index 05e18d658141..8b8306555508 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c @@ -49,7 +49,7 @@ struct ide_acpi_hwif_link { #define DEBPRINT(fmt, args...) \ printk(KERN_DEBUG "%s: " fmt, __func__, ## args) #else -#define DEBPRINT(fmt, args...) do {} while (0) +#define DEBPRINT(fmt, args...) ((void)0) #endif /* DEBUGGING */ static bool ide_noacpi; diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index 50ba304c6b60..34c6de2859f9 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c @@ -19,7 +19,7 @@ #define debug_log(fmt, args...) \ printk(KERN_INFO "ide: " fmt, ## args) #else -#define debug_log(fmt, args...) do {} while (0) +#define debug_log(fmt, args...) ((void)0) #endif #define ATAPI_MIN_CDB_BYTES 12 diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h index 04f0f310a856..7b83a97c4fad 100644 --- a/drivers/ide/ide-cd.h +++ b/drivers/ide/ide-cd.h @@ -14,7 +14,7 @@ #if IDECD_DEBUG_LOG #define ide_debug_log(lvl, fmt, args...) __ide_debug_log(lvl, fmt, ## args) #else -#define ide_debug_log(lvl, fmt, args...) do {} while (0) +#define ide_debug_log(lvl, fmt, args...) ((void)0) #endif #define ATAPI_WAIT_WRITE_BUSY (10 * HZ) diff --git a/drivers/ide/ide-gd.h b/drivers/ide/ide-gd.h index af3fe1880e9e..e4ccbbf6e7dc 100644 --- a/drivers/ide/ide-gd.h +++ b/drivers/ide/ide-gd.h @@ -11,7 +11,7 @@ #if IDE_GD_DEBUG_LOG #define ide_debug_log(lvl, fmt, args...) __ide_debug_log(lvl, fmt, ## args) #else -#define ide_debug_log(lvl, fmt, args...) do {} while (0) +#define ide_debug_log(lvl, fmt, args...) ((void)0) #endif struct ide_disk_obj { diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index fd57e8ccc47a..df389771b25f 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c @@ -52,7 +52,7 @@ #ifdef IDETAPE_DEBUG_LOG #define ide_debug_log(lvl, fmt, args...) __ide_debug_log(lvl, fmt, ## args) #else -#define ide_debug_log(lvl, fmt, args...) do {} while (0) +#define ide_debug_log(lvl, fmt, args...) ((void)0) #endif /**************************** Tunable parameters *****************************/ diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h index 3f9e56e8b379..7b72d0d2fc80 100644 --- a/drivers/infiniband/hw/nes/nes.h +++ b/drivers/infiniband/hw/nes/nes.h @@ -160,7 +160,7 @@ do { \ #define NES_EVENT_TIMEOUT 1200000 #else #define nes_debug(level, fmt, args...) -#define assert(expr) do {} while (0) +#define assert(expr) ((void)0) #define NES_EVENT_TIMEOUT 100000 #endif diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c index 573191dd78e8..407e296d27d4 100644 --- a/drivers/input/joystick/grip_mp.c +++ b/drivers/input/joystick/grip_mp.c @@ -27,7 +27,7 @@ MODULE_LICENSE("GPL"); #ifdef GRIP_DEBUG #define dbg(format, arg...) printk(KERN_ERR __FILE__ ": " format "\n" , ## arg) #else -#define dbg(format, arg...) do {} while (0) +#define dbg(format, arg...) ((void)0) #endif #define GRIP_MAX_PORTS 4 diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c index 4a95b224169f..5694d1b46e5e 100644 --- a/drivers/input/joystick/sidewinder.c +++ b/drivers/input/joystick/sidewinder.c @@ -61,7 +61,7 @@ MODULE_LICENSE("GPL"); #ifdef SW_DEBUG #define dbg(format, arg...) printk(KERN_DEBUG __FILE__ ": " format "\n" , ## arg) #else -#define dbg(format, arg...) do {} while (0) +#define dbg(format, arg...) ((void)0) #endif /* diff --git a/drivers/input/keyboard/lkkbd.c b/drivers/input/keyboard/lkkbd.c index 471d53815c6d..c2982988c5aa 100644 --- a/drivers/input/keyboard/lkkbd.c +++ b/drivers/input/keyboard/lkkbd.c @@ -106,7 +106,7 @@ MODULE_PARM_DESC(lk201_compose_is_alt, #ifdef LKKBD_DEBUG #define DBG(x...) printk(x) #else -#define DBG(x...) do {} while (0) +#define DBG(x...) ((void)0) #endif /* LED control */ diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c index abd494411e69..6d6567c02103 100644 --- a/drivers/input/mouse/vsxxxaa.c +++ b/drivers/input/mouse/vsxxxaa.c @@ -93,7 +93,7 @@ MODULE_LICENSE("GPL"); #ifdef VSXXXAA_DEBUG #define DBG(x...) printk(x) #else -#define DBG(x...) do {} while (0) +#define DBG(x...) ((void)0) #endif #define VSXXXAA_INTRO_MASK 0x80 diff --git a/drivers/irqchip/irq-metag-ext.c b/drivers/irqchip/irq-metag-ext.c index e67483161f0f..cafc566eaac8 100644 --- a/drivers/irqchip/irq-metag-ext.c +++ b/drivers/irqchip/irq-metag-ext.c @@ -770,7 +770,7 @@ static void __init meta_intc_init_syscore_ops(struct meta_intc_priv *priv) register_syscore_ops(&meta_intc_syscore_ops); } #else -#define meta_intc_init_syscore_ops(priv) do {} while (0) +#define meta_intc_init_syscore_ops(priv) ((void)0) #endif /** diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h index 166537e2dfca..a70f19b6fa70 100644 --- a/drivers/isdn/gigaset/gigaset.h +++ b/drivers/isdn/gigaset/gigaset.h @@ -101,7 +101,7 @@ enum debuglevel { #else -#define gig_dbg(level, format, arg...) do {} while (0) +#define gig_dbg(level, format, arg...) ((void)0) #define DEBUG_DEFAULT 0 #endif diff --git a/drivers/isdn/hisax/hisax_debug.h b/drivers/isdn/hisax/hisax_debug.h index 7b3093d0856a..0f1751ee04ce 100644 --- a/drivers/isdn/hisax/hisax_debug.h +++ b/drivers/isdn/hisax/hisax_debug.h @@ -71,9 +71,9 @@ dump_packet(const char *name, const u_char *data, int pkt_len) #else -#define DBG(level, format, arg...) do {} while (0) -#define DBG_PACKET(level, data, count) do {} while (0) -#define DBG_SKB(level, skb) do {} while (0) +#define DBG(level, format, arg...) ((void)0) +#define DBG_PACKET(level, data, count) ((void)0) +#define DBG_SKB(level, skb) ((void)0) #endif diff --git a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h index 8cd2d8277426..779a05adca5c 100644 --- a/drivers/isdn/hisax/st5481.h +++ b/drivers/isdn/hisax/st5481.h @@ -520,7 +520,7 @@ static inline const char *ST5481_CMD_string(int evt) #else -#define DBG_ISO_PACKET(level, urb) do {} while (0) +#define DBG_ISO_PACKET(level, urb) ((void)0) #endif diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c index 1f3c450c7a69..694d42ec4e97 100644 --- a/drivers/media/platform/soc_camera/soc_camera.c +++ b/drivers/media/platform/soc_camera/soc_camera.c @@ -1483,8 +1483,8 @@ static void scan_async_host(struct soc_camera_host *ici) } #else #define soc_camera_i2c_init(icd, sdesc) (-ENODEV) -#define soc_camera_i2c_free(icd) do {} while (0) -#define scan_async_host(ici) do {} while (0) +#define soc_camera_i2c_free(icd) ((void)0) +#define scan_async_host(ici) ((void)0) #endif #ifdef CONFIG_OF diff --git a/drivers/media/usb/pvrusb2/pvrusb2-io.c b/drivers/media/usb/pvrusb2/pvrusb2-io.c index 6d153fc23ec2..9060d425f234 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-io.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-io.c @@ -39,7 +39,7 @@ static const char *pvr2_buffer_state_decode(enum pvr2_buffer_state); } \ } while (0) #else -#define BUFFER_CHECK(bp) do {} while (0) +#define BUFFER_CHECK(bp) ((void)0) #endif struct pvr2_stream { diff --git a/drivers/media/usb/usbvision/usbvision-core.c b/drivers/media/usb/usbvision/usbvision-core.c index 3f87fbc80be2..33452881735b 100644 --- a/drivers/media/usb/usbvision/usbvision-core.c +++ b/drivers/media/usb/usbvision/usbvision-core.c @@ -74,7 +74,7 @@ MODULE_PARM_DESC(adjust_y_offset, "adjust Y offset display [core]"); __func__, __LINE__ , ## args); \ } #else - #define PDEBUG(level, fmt, args...) do {} while (0) + #define PDEBUG(level, fmt, args...) ((void)0) #endif #define DBG_HEADER (1 << 0) diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c index 4c39c502d616..b617f644e23a 100644 --- a/drivers/media/usb/usbvision/usbvision-video.c +++ b/drivers/media/usb/usbvision/usbvision-video.c @@ -85,7 +85,7 @@ __func__, __LINE__ , ## args); \ } #else - #define PDEBUG(level, fmt, args...) do {} while (0) + #define PDEBUG(level, fmt, args...) ((void)0) #endif #define DBG_IO (1 << 1) diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c index a1667339e21d..65d8a9f384d6 100644 --- a/drivers/mmc/host/au1xmmc.c +++ b/drivers/mmc/host/au1xmmc.c @@ -58,7 +58,7 @@ #define DBG(fmt, idx, args...) \ pr_debug("au1xmmc(%d): DEBUG: " fmt, idx, ##args) #else -#define DBG(fmt, idx, args...) do {} while (0) +#define DBG(fmt, idx, args...) ((void)0) #endif /* Hardware definitions */ diff --git a/drivers/net/ethernet/dnet.c b/drivers/net/ethernet/dnet.c index f7d126a2617e..9f3117a43ed8 100644 --- a/drivers/net/ethernet/dnet.c +++ b/drivers/net/ethernet/dnet.c @@ -505,7 +505,7 @@ static inline void dnet_print_skb(struct sk_buff *skb) printk("\n"); } #else -#define dnet_print_skb(skb) do {} while (0) +#define dnet_print_skb(skb) ((void)0) #endif static netdev_tx_t dnet_start_xmit(struct sk_buff *skb, struct net_device *dev) diff --git a/drivers/net/ethernet/intel/i40e/i40e_osdep.h b/drivers/net/ethernet/intel/i40e/i40e_osdep.h index 80e66da6b145..02e256de97b6 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_osdep.h +++ b/drivers/net/ethernet/intel/i40e/i40e_osdep.h @@ -41,7 +41,7 @@ * actual OS primitives */ -#define hw_dbg(hw, S, A...) do {} while (0) +#define hw_dbg(hw, S, A...) ((void)0) #define wr32(a, reg, value) writel((value), ((a)->hw_addr + (reg))) #define rd32(a, reg) readl((a)->hw_addr + (reg)) diff --git a/drivers/net/ethernet/intel/i40evf/i40e_osdep.h b/drivers/net/ethernet/intel/i40evf/i40e_osdep.h index a90737786c34..3d25582c5bce 100644 --- a/drivers/net/ethernet/intel/i40evf/i40e_osdep.h +++ b/drivers/net/ethernet/intel/i40evf/i40e_osdep.h @@ -40,7 +40,7 @@ * actual OS primitives */ -#define hw_dbg(hw, S, A...) do {} while (0) +#define hw_dbg(hw, S, A...) ((void)0) #define wr32(a, reg, value) writel((value), ((a)->hw_addr + (reg))) #define rd32(a, reg) readl((a)->hw_addr + (reg)) diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h index 7078330e25c1..774ac37336e2 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h @@ -180,9 +180,9 @@ #else -#define INC_PERF_COUNTER(cnt) do {} while (0) -#define ADD_PERF_COUNTER(cnt, add) do {} while (0) -#define AVG_PERF_COUNTER(cnt, sample) do {} while (0) +#define INC_PERF_COUNTER(cnt) ((void)0) +#define ADD_PERF_COUNTER(cnt, add) ((void)0) +#define AVG_PERF_COUNTER(cnt, sample) ((void)0) #define GET_PERF_COUNTER(cnt) (0) #define GET_AVG_PERF_COUNTER(cnt) (0) #endif /* MLX4_EN_PERF_STAT */ diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c index d118da5a10a2..cdf7e65de1e4 100644 --- a/drivers/net/ethernet/realtek/8139too.c +++ b/drivers/net/ethernet/realtek/8139too.c @@ -131,7 +131,7 @@ #ifdef RTL8139_NDEBUG -# define assert(expr) do {} while (0) +# define assert(expr) ((void)0) #else # define assert(expr) \ if (unlikely(!(expr))) { \ diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 9e972c7d449a..2fb9e61a5d02 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -66,8 +66,8 @@ #define dprintk(fmt, args...) \ do { printk(KERN_DEBUG PFX fmt, ## args); } while (0) #else -#define assert(expr) do {} while (0) -#define dprintk(fmt, args...) do {} while (0) +#define assert(expr) ((void)0) +#define dprintk(fmt, args...) ((void)0) #endif /* RTL8169_DEBUG */ #define R8169_MSG_DEFAULT \ diff --git a/drivers/net/ethernet/sfc/falcon/net_driver.h b/drivers/net/ethernet/sfc/falcon/net_driver.h index 37a8bdf32206..7aacd5035823 100644 --- a/drivers/net/ethernet/sfc/falcon/net_driver.h +++ b/drivers/net/ethernet/sfc/falcon/net_driver.h @@ -47,8 +47,8 @@ #define EF4_BUG_ON_PARANOID(x) BUG_ON(x) #define EF4_WARN_ON_PARANOID(x) WARN_ON(x) #else -#define EF4_BUG_ON_PARANOID(x) do {} while (0) -#define EF4_WARN_ON_PARANOID(x) do {} while (0) +#define EF4_BUG_ON_PARANOID(x) ((void)0) +#define EF4_WARN_ON_PARANOID(x) ((void)0) #endif /************************************************************************** diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h index c0537ea06c9a..31ab15f95a99 100644 --- a/drivers/net/ethernet/sfc/net_driver.h +++ b/drivers/net/ethernet/sfc/net_driver.h @@ -47,8 +47,8 @@ #define EFX_WARN_ON_ONCE_PARANOID(x) WARN_ON_ONCE(x) #define EFX_WARN_ON_PARANOID(x) WARN_ON(x) #else -#define EFX_WARN_ON_ONCE_PARANOID(x) do {} while (0) -#define EFX_WARN_ON_PARANOID(x) do {} while (0) +#define EFX_WARN_ON_ONCE_PARANOID(x) ((void)0) +#define EFX_WARN_ON_PARANOID(x) ((void)0) #endif /************************************************************************** diff --git a/drivers/net/ethernet/smsc/smsc911x.h b/drivers/net/ethernet/smsc/smsc911x.h index 8d75508acd2b..754532edd5c3 100644 --- a/drivers/net/ethernet/smsc/smsc911x.h +++ b/drivers/net/ethernet/smsc/smsc911x.h @@ -69,7 +69,7 @@ #define SMSC_ASSERT_MAC_LOCK(pdata) \ WARN_ON_SMP(!spin_is_locked(&pdata->mac_lock)) #else -#define SMSC_ASSERT_MAC_LOCK(pdata) do {} while (0) +#define SMSC_ASSERT_MAC_LOCK(pdata) ((void)0) #endif /* CONFIG_DEBUG_SPINLOCK */ /* SMSC911x registers and bitfields */ @@ -412,7 +412,7 @@ * Provide hooks to let the arch add to the initialisation procedure * and to override the source of the MAC address. */ -#define SMSC_INITIALIZE() do {} while (0) +#define SMSC_INITIALIZE() ((void)0) #define smsc_get_mac(dev) smsc911x_read_mac_address((dev)) #ifdef CONFIG_SMSC911X_ARCH_HOOKS diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c index f0c33d00dcb4..c010baaddec9 100644 --- a/drivers/net/ethernet/via/via-velocity.c +++ b/drivers/net/ethernet/via/via-velocity.c @@ -3685,8 +3685,8 @@ static void velocity_unregister_notifier(void) #else -#define velocity_register_notifier() do {} while (0) -#define velocity_unregister_notifier() do {} while (0) +#define velocity_register_notifier() ((void)0) +#define velocity_unregister_notifier() ((void)0) #endif /* defined(CONFIG_PM) && defined(CONFIG_INET) */ diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index a043fb1367bd..6e8d4de64baa 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c @@ -1050,7 +1050,7 @@ static void dscc4_pci_reset(struct pci_dev *pdev, void __iomem *ioaddr) mutex_unlock(&dscc4_mutex); } #else -#define dscc4_pci_reset(pdev,ioaddr) do {} while (0) +#define dscc4_pci_reset(pdev,ioaddr) ((void)0) #endif /* CONFIG_DSCC4_PCI_RST */ static int dscc4_open(struct net_device *dev) diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h index 28068544e2fe..4be3a9b5d4f8 100644 --- a/drivers/net/wireless/ath/ath.h +++ b/drivers/net/wireless/ath/ath.h @@ -310,7 +310,7 @@ void _ath_dbg(struct ath_common *common, enum ATH_DEBUG dbg_mask, #define ath_dbg(common, dbg_mask, fmt, ...) \ _ath_dbg(common, ATH_DBG_##dbg_mask, fmt, ##__VA_ARGS__) -#define ATH_DBG_WARN(foo, arg...) do {} while (0) +#define ATH_DBG_WARN(foo, arg...) ((void)0) #define ATH_DBG_WARN_ON_ONCE(foo) ({ \ int __ret_warn_once = !!(foo); \ unlikely(__ret_warn_once); \ diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c index 8fbdd7d4fd0c..92f3b53c1e94 100644 --- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c @@ -221,7 +221,7 @@ do { \ } \ } while (0) #else -#define IPW_DEBUG(level, message...) do {} while (0) +#define IPW_DEBUG(level, message...) ((void)0) #endif /* CONFIG_IPW2100_DEBUG */ #ifdef CONFIG_IPW2100_DEBUG diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c index 3c447d6f84af..90fbb4205a42 100644 --- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c @@ -3491,7 +3491,7 @@ static void free_firmware(void) } } #else -#define free_firmware() do {} while (0) +#define free_firmware() ((void)0) #endif static int ipw_load(struct ipw_priv *priv) diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.h b/drivers/net/wireless/intel/ipw2x00/ipw2200.h index aa301d1eee3c..15978d443ccc 100644 --- a/drivers/net/wireless/intel/ipw2x00/ipw2200.h +++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.h @@ -1405,7 +1405,7 @@ do { if (ipw_debug_level & (level)) \ printk(KERN_DEBUG DRV_NAME": %c %s " fmt, \ in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0) #else -#define IPW_LL_DEBUG(level, fmt, args...) do {} while (0) +#define IPW_LL_DEBUG(level, fmt, args...) ((void)0) #endif /* CONFIG_IPW2200_DEBUG */ /* diff --git a/drivers/net/wireless/intel/ipw2x00/libipw.h b/drivers/net/wireless/intel/ipw2x00/libipw.h index b51355134e04..3098d52884b5 100644 --- a/drivers/net/wireless/intel/ipw2x00/libipw.h +++ b/drivers/net/wireless/intel/ipw2x00/libipw.h @@ -67,7 +67,7 @@ do { if (libipw_debug_level & (level)) \ printk(KERN_DEBUG "libipw: %c %s " fmt, \ in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0) #else -#define LIBIPW_DEBUG(level, fmt, args...) do {} while (0) +#define LIBIPW_DEBUG(level, fmt, args...) ((void)0) #endif /* CONFIG_LIBIPW_DEBUG */ /* diff --git a/drivers/net/wireless/marvell/libertas/defs.h b/drivers/net/wireless/marvell/libertas/defs.h index 58e2ead7b0cc..4304e39f322d 100644 --- a/drivers/net/wireless/marvell/libertas/defs.h +++ b/drivers/net/wireless/marvell/libertas/defs.h @@ -53,7 +53,7 @@ do { if ((lbs_debug & (grp)) == (grp)) \ printk(KERN_DEBUG DRV_NAME grpnam "%s: " fmt, \ in_interrupt() ? " (INT)" : "", ## args); } while (0) #else -#define LBS_DEB_LL(grp, grpnam, fmt, args...) do {} while (0) +#define LBS_DEB_LL(grp, grpnam, fmt, args...) ((void)0) #endif #define lbs_deb_main(fmt, args...) LBS_DEB_LL(LBS_DEB_MAIN, " main", fmt, ##args) @@ -104,7 +104,7 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, } } #else -#define lbs_deb_hex(grp,prompt,buf,len) do {} while (0) +#define lbs_deb_hex(grp,prompt,buf,len) ((void)0) #endif diff --git a/drivers/net/wireless/marvell/libertas_tf/deb_defs.h b/drivers/net/wireless/marvell/libertas_tf/deb_defs.h index 37a98e228b46..43085b979087 100644 --- a/drivers/net/wireless/marvell/libertas_tf/deb_defs.h +++ b/drivers/net/wireless/marvell/libertas_tf/deb_defs.h @@ -51,7 +51,7 @@ do { if ((lbtf_debug & (grp)) == (grp)) \ printk(KERN_DEBUG DRV_NAME grpnam "%s: " fmt, \ in_interrupt() ? " (INT)" : "", ## args); } while (0) #else -#define LBTF_DEB_LL(grp, grpnam, fmt, args...) do {} while (0) +#define LBTF_DEB_LL(grp, grpnam, fmt, args...) ((void)0) #endif #define lbtf_deb_enter(grp) \ @@ -99,7 +99,7 @@ static inline void lbtf_deb_hex(unsigned int grp, const char *prompt, u8 *buf, i } } #else -#define lbtf_deb_hex(grp, prompt, buf, len) do {} while (0) +#define lbtf_deb_hex(grp, prompt, buf, len) ((void)0) #endif #endif diff --git a/drivers/pcmcia/i82092aa.h b/drivers/pcmcia/i82092aa.h index fabe08c3e33d..954a9a650b84 100644 --- a/drivers/pcmcia/i82092aa.h +++ b/drivers/pcmcia/i82092aa.h @@ -10,9 +10,9 @@ #define leave(x) printk("Leave: %s, %s line %i\n",x,__FILE__,__LINE__) #define dprintk(fmt, args...) printk(fmt , ## args) #else -#define enter(x) do {} while (0) -#define leave(x) do {} while (0) -#define dprintk(fmt, args...) do {} while (0) +#define enter(x) ((void)0) +#define leave(x) ((void)0) +#define dprintk(fmt, args...) ((void)0) #endif diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c index f5c062822de9..94e1d900282e 100644 --- a/drivers/rapidio/devices/rio_mport_cdev.c +++ b/drivers/rapidio/devices/rio_mport_cdev.c @@ -2085,7 +2085,7 @@ static void mport_cdev_release_dma(struct file *filp) priv->dmach = NULL; } #else -#define mport_cdev_release_dma(priv) do {} while (0) +#define mport_cdev_release_dma(priv) ((void)0) #endif /* diff --git a/drivers/rapidio/devices/tsi721.h b/drivers/rapidio/devices/tsi721.h index 957eadc58150..a038a44cdd64 100644 --- a/drivers/rapidio/devices/tsi721.h +++ b/drivers/rapidio/devices/tsi721.h @@ -929,8 +929,8 @@ extern int tsi721_register_dma(struct tsi721_device *priv); extern void tsi721_unregister_dma(struct tsi721_device *priv); extern void tsi721_dma_stop_all(struct tsi721_device *priv); #else -#define tsi721_dma_stop_all(priv) do {} while (0) -#define tsi721_unregister_dma(priv) do {} while (0) +#define tsi721_dma_stop_all(priv) ((void)0) +#define tsi721_unregister_dma(priv) ((void)0) #endif #endif diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 18dce26515ce..ebc00608caec 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c @@ -1138,8 +1138,8 @@ error: } #else -#define dasd_profile_start(block, cqr, req) do {} while (0) -#define dasd_profile_end(block, cqr, req) do {} while (0) +#define dasd_profile_start(block, cqr, req) ((void)0) +#define dasd_profile_end(block, cqr, req) ((void)0) static void dasd_statistics_createroot(void) { diff --git a/drivers/scsi/53c700.h b/drivers/scsi/53c700.h index 0c9a100af667..3bed517a158b 100644 --- a/drivers/scsi/53c700.h +++ b/drivers/scsi/53c700.h @@ -28,9 +28,9 @@ #define CDEBUG(prefix, scmd, fmt, a...) \ scmd_printk(prefix, scmd, fmt, ##a) #else -#define DEBUG(x) do {} while (0) -#define DDEBUG(prefix, scmd, fmt, a...) do {} while (0) -#define CDEBUG(prefix, scmd, fmt, a...) do {} while (0) +#define DEBUG(x) ((void)0) +#define DDEBUG(prefix, scmd, fmt, a...) ((void)0) +#define CDEBUG(prefix, scmd, fmt, a...) ((void)0) #endif /* The number of available command slots */ diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h index 5935fd6d1a05..a0753b678288 100644 --- a/drivers/scsi/NCR5380.h +++ b/drivers/scsi/NCR5380.h @@ -263,8 +263,8 @@ static inline struct scsi_cmnd *NCR5380_to_scmd(struct NCR5380_cmd *ncmd_ptr) static void NCR5380_print_phase(struct Scsi_Host *instance); static void NCR5380_print(struct Scsi_Host *instance); #else -#define NCR5380_dprint(flg, arg) do {} while (0) -#define NCR5380_dprint_phase(flg, arg) do {} while (0) +#define NCR5380_dprint(flg, arg) ((void)0) +#define NCR5380_dprint_phase(flg, arg) ((void)0) #endif static int NCR5380_init(struct Scsi_Host *instance, int flags); diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c index 3487ef2c1b23..cb062d00cead 100644 --- a/drivers/scsi/dc395x.c +++ b/drivers/scsi/dc395x.c @@ -136,7 +136,7 @@ * No debugging. Do nothing */ #define dprintkdbg(type, format, arg...) \ - do {} while (0) + ((void)0) #define debug_enabled(type) (0) #endif diff --git a/drivers/scsi/osd/osd_debug.h b/drivers/scsi/osd/osd_debug.h index 26341261bb5c..1c6c00204132 100644 --- a/drivers/scsi/osd/osd_debug.h +++ b/drivers/scsi/osd/osd_debug.h @@ -21,7 +21,7 @@ #define OSD_DEBUG(fmt, a...) \ printk(KERN_NOTICE "osd @%s:%d: " fmt, __func__, __LINE__, ##a) #else -#define OSD_DEBUG(fmt, a...) do {} while (0) +#define OSD_DEBUG(fmt, a...) ((void)0) #endif /* u64 has problems with printk this will cast it to unsigned long long */ diff --git a/drivers/scsi/qla4xxx/ql4_dbg.h b/drivers/scsi/qla4xxx/ql4_dbg.h index 51c365bcf912..75b0c95c03cf 100644 --- a/drivers/scsi/qla4xxx/ql4_dbg.h +++ b/drivers/scsi/qla4xxx/ql4_dbg.h @@ -19,44 +19,44 @@ #if defined(QL_DEBUG) #define DEBUG(x) do {x;} while (0); #else -#define DEBUG(x) do {} while (0); +#define DEBUG(x) ((void)0); #endif #if defined(QL_DEBUG_LEVEL_2) #define DEBUG2(x) do {if(ql4xextended_error_logging == 2) x;} while (0); #define DEBUG2_3(x) do {x;} while (0); #else /* */ -#define DEBUG2(x) do {} while (0); +#define DEBUG2(x) ((void)0); #endif /* */ #if defined(QL_DEBUG_LEVEL_3) #define DEBUG3(x) do {if(ql4xextended_error_logging == 3) x;} while (0); #else /* */ -#define DEBUG3(x) do {} while (0); +#define DEBUG3(x) ((void)0); #if !defined(QL_DEBUG_LEVEL_2) -#define DEBUG2_3(x) do {} while (0); +#define DEBUG2_3(x) ((void)0); #endif /* */ #endif /* */ #if defined(QL_DEBUG_LEVEL_4) #define DEBUG4(x) do {x;} while (0); #else /* */ -#define DEBUG4(x) do {} while (0); +#define DEBUG4(x) ((void)0); #endif /* */ #if defined(QL_DEBUG_LEVEL_5) #define DEBUG5(x) do {x;} while (0); #else /* */ -#define DEBUG5(x) do {} while (0); +#define DEBUG5(x) ((void)0); #endif /* */ #if defined(QL_DEBUG_LEVEL_7) #define DEBUG7(x) do {x; } while (0) #else /* */ -#define DEBUG7(x) do {} while (0) +#define DEBUG7(x) ((void)0) #endif /* */ #if defined(QL_DEBUG_LEVEL_9) #define DEBUG9(x) do {x;} while (0); #else /* */ -#define DEBUG9(x) do {} while (0); +#define DEBUG9(x) ((void)0); #endif /* */ diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c index 1c34c9314c8a..4cbfb699ebc8 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c @@ -131,7 +131,7 @@ static inline int getmiso(const struct spi_device *spi) * reaching even one Mbit/sec (except when we can inline bitops), so for now * we'll just assume we never need additional per-bit slowdowns. */ -#define spidelay(nsecs) do {} while (0) +#define spidelay(nsecs) ((void)0) #include "spi-bitbang-txrx.h" diff --git a/drivers/staging/ccree/ssi_driver.h b/drivers/staging/ccree/ssi_driver.h index b6ad89ae9bee..a3d6948986dc 100644 --- a/drivers/staging/ccree/ssi_driver.h +++ b/drivers/staging/ccree/ssi_driver.h @@ -100,7 +100,7 @@ #ifdef CC_DEBUG #define SSI_LOG_DEBUG(format, ...) SSI_LOG(KERN_DEBUG, format, ##__VA_ARGS__) #else /* Debug log messages are removed at compile time for non-DEBUG config. */ -#define SSI_LOG_DEBUG(format, ...) do {} while (0) +#define SSI_LOG_DEBUG(format, ...) ((void)0) #endif #define MIN(a, b) (((a) < (b)) ? (a) : (b)) diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h index 709771d27f89..ea3fd980c698 100644 --- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h @@ -225,16 +225,16 @@ do { \ #else /* !LASSERT_ATOMIC_ENABLED */ -#define LASSERT_ATOMIC_EQ(a, v) do {} while (0) -#define LASSERT_ATOMIC_NE(a, v) do {} while (0) -#define LASSERT_ATOMIC_LT(a, v) do {} while (0) -#define LASSERT_ATOMIC_LE(a, v) do {} while (0) -#define LASSERT_ATOMIC_GT(a, v) do {} while (0) -#define LASSERT_ATOMIC_GE(a, v) do {} while (0) -#define LASSERT_ATOMIC_GT_LT(a, v1, v2) do {} while (0) -#define LASSERT_ATOMIC_GT_LE(a, v1, v2) do {} while (0) -#define LASSERT_ATOMIC_GE_LT(a, v1, v2) do {} while (0) -#define LASSERT_ATOMIC_GE_LE(a, v1, v2) do {} while (0) +#define LASSERT_ATOMIC_EQ(a, v) ((void)0) +#define LASSERT_ATOMIC_NE(a, v) ((void)0) +#define LASSERT_ATOMIC_LT(a, v) ((void)0) +#define LASSERT_ATOMIC_LE(a, v) ((void)0) +#define LASSERT_ATOMIC_GT(a, v) ((void)0) +#define LASSERT_ATOMIC_GE(a, v) ((void)0) +#define LASSERT_ATOMIC_GT_LT(a, v1, v2) ((void)0) +#define LASSERT_ATOMIC_GT_LE(a, v1, v2) ((void)0) +#define LASSERT_ATOMIC_GE_LT(a, v1, v2) ((void)0) +#define LASSERT_ATOMIC_GE_LE(a, v1, v2) ((void)0) #endif /* LASSERT_ATOMIC_ENABLED */ diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h index fa0808d2953b..9d8ca9141ac4 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h +++ b/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h @@ -110,7 +110,7 @@ do { \ } while (0) #define CFS_CHECK_STACK(msgdata, mask, cdls) __CHECK_STACK(msgdata, mask, cdls) #else /* __x86_64__ */ -#define CFS_CHECK_STACK(msgdata, mask, cdls) do {} while (0) +#define CFS_CHECK_STACK(msgdata, mask, cdls) ((void)0) #define CDEBUG_STACK() (0L) #endif /* __x86_64__ */ diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h index 98a5e2c21a83..a8002ecc37f7 100644 --- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h @@ -940,7 +940,7 @@ static inline void kiblnd_dma_unmap_single(struct ib_device *dev, ib_dma_unmap_single(dev, addr, size, direction); } -#define KIBLND_UNMAP_ADDR_SET(p, m, a) do {} while (0) +#define KIBLND_UNMAP_ADDR_SET(p, m, a) ((void)0) #define KIBLND_UNMAP_ADDR(p, m, a) (a) static inline int kiblnd_dma_map_sg(struct ib_device *dev, diff --git a/drivers/staging/lustre/lustre/include/obd_class.h b/drivers/staging/lustre/lustre/include/obd_class.h index 976005a1e0b2..597dfde3af25 100644 --- a/drivers/staging/lustre/lustre/include/obd_class.h +++ b/drivers/staging/lustre/lustre/include/obd_class.h @@ -210,8 +210,8 @@ extern void (*class_export_dump_hook)(struct obd_export *); #else -#define __class_export_add_lock_ref(exp, lock) do {} while (0) -#define __class_export_del_lock_ref(exp, lock) do {} while (0) +#define __class_export_add_lock_ref(exp, lock) ((void)0) +#define __class_export_del_lock_ref(exp, lock) ((void)0) #endif diff --git a/drivers/staging/lustre/lustre/include/obd_support.h b/drivers/staging/lustre/lustre/include/obd_support.h index aea193a882a2..51c6809634fd 100644 --- a/drivers/staging/lustre/lustre/include/obd_support.h +++ b/drivers/staging/lustre/lustre/include/obd_support.h @@ -511,7 +511,7 @@ extern char obd_jobid_var[]; #define OBD_FAILED CFS_FAILED #ifdef CONFIG_DEBUG_SLAB -#define POISON(ptr, c, s) do {} while (0) +#define POISON(ptr, c, s) ((void)0) #define POISON_PTR(ptr) ((void)0) #else #define POISON(ptr, c, s) memset(ptr, c, s) diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c index 8c97acd79211..e9f74f219f0b 100644 --- a/drivers/staging/lustre/lustre/mdc/mdc_request.c +++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c @@ -1099,7 +1099,7 @@ static void mdc_adjust_dirpages(struct page **pages, int cfs_pgs, int lu_pgs) LASSERTF(lu_pgs == 0, "left = %d", lu_pgs); } #else -#define mdc_adjust_dirpages(pages, cfs_pgs, lu_pgs) do {} while (0) +#define mdc_adjust_dirpages(pages, cfs_pgs, lu_pgs) ((void)0) #endif /* PAGE_SIZE > LU_PAGE_SIZE */ /* parameters for readdir page */ diff --git a/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c b/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c index aad4ff191d95..2806600a5bb1 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c +++ b/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c @@ -246,8 +246,8 @@ do { \ spin_unlock(&ptlrpc_rs_debug_lock); \ } while (0) #else -# define PTLRPC_RS_DEBUG_LRU_ADD(rs) do {} while (0) -# define PTLRPC_RS_DEBUG_LRU_DEL(rs) do {} while (0) +# define PTLRPC_RS_DEBUG_LRU_ADD(rs) ((void)0) +# define PTLRPC_RS_DEBUG_LRU_DEL(rs) ((void)0) #endif struct ptlrpc_reply_state * diff --git a/drivers/staging/qca-wifi-host-cmn/qdf/inc/qdf_lock.h b/drivers/staging/qca-wifi-host-cmn/qdf/inc/qdf_lock.h index 91f8948f723f..016f074dde88 100644 --- a/drivers/staging/qca-wifi-host-cmn/qdf/inc/qdf_lock.h +++ b/drivers/staging/qca-wifi-host-cmn/qdf/inc/qdf_lock.h @@ -54,15 +54,15 @@ #if !QDF_LOCK_STATS struct lock_stats {}; -#define BEFORE_LOCK(x...) do {} while (0) -#define AFTER_LOCK(x...) do {} while (0) -#define BEFORE_TRYLOCK(x...) do {} while (0) -#define AFTER_TRYLOCK(x...) do {} while (0) -#define BEFORE_UNLOCK(x...) do {} while (0) -#define qdf_lock_stats_create(x...) do {} while (0) -#define qdf_lock_stats_destroy(x...) do {} while (0) -#define qdf_lock_stats_init(x...) do {} while (0) -#define qdf_lock_stats_deinit(x...) do {} while (0) +#define BEFORE_LOCK(x...) ((void)0) +#define AFTER_LOCK(x...) ((void)0) +#define BEFORE_TRYLOCK(x...) ((void)0) +#define AFTER_TRYLOCK(x...) ((void)0) +#define BEFORE_UNLOCK(x...) ((void)0) +#define qdf_lock_stats_create(x...) ((void)0) +#define qdf_lock_stats_destroy(x...) ((void)0) +#define qdf_lock_stats_init(x...) ((void)0) +#define qdf_lock_stats_deinit(x...) ((void)0) #else void qdf_lock_stats_init(void); void qdf_lock_stats_deinit(void); @@ -91,7 +91,7 @@ do { \ uint64_t AFTER_LOCK_time; \ bool BEFORE_LOCK_is_locked = was_locked; \ BEFORE_LOCK_time = qdf_get_log_timestamp_lightweight(); \ - do {} while (0) + ((void)0) #define AFTER_LOCK(lock, func) \ @@ -122,7 +122,7 @@ do { \ uint64_t BEFORE_LOCK_time; \ uint64_t AFTER_LOCK_time; \ BEFORE_LOCK_time = qdf_get_log_timestamp_lightweight(); \ - do {} while (0) + ((void)0) #define AFTER_TRYLOCK(lock, trylock_return, func) \ AFTER_LOCK_time = qdf_get_log_timestamp_lightweight(); \ diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c index 674ac5396d00..8ee521ca2e68 100644 --- a/drivers/staging/rtl8188eu/hal/usb_halinit.c +++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c @@ -665,7 +665,7 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) struct registry_priv *pregistrypriv = &Adapter->registrypriv; unsigned long init_start_time = jiffies; - #define HAL_INIT_PROFILE_TAG(stage) do {} while (0) + #define HAL_INIT_PROFILE_TAG(stage) ((void)0) HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN); diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme.h b/drivers/staging/rtl8188eu/include/rtw_mlme.h index 5c5d0ae8bdd1..4cbc7572d639 100644 --- a/drivers/staging/rtl8188eu/include/rtw_mlme.h +++ b/drivers/staging/rtl8188eu/include/rtw_mlme.h @@ -330,9 +330,9 @@ void rtw_scan_timeout_handler(unsigned long data); void rtw_dynamic_check_timer_handlder(unsigned long data); #define rtw_is_scan_deny(adapter) false -#define rtw_clear_scan_deny(adapter) do {} while (0) -#define rtw_set_scan_deny_timer_hdl(adapter) do {} while (0) -#define rtw_set_scan_deny(adapter, ms) do {} while (0) +#define rtw_clear_scan_deny(adapter) ((void)0) +#define rtw_set_scan_deny_timer_hdl(adapter) ((void)0) +#define rtw_set_scan_deny(adapter, ms) ((void)0) void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h index b062cad052b9..7cc45e966d5d 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h @@ -471,7 +471,7 @@ do { if (ieee80211_debug_level & (level)) \ } \ } while (0) #else -#define IEEE80211_DEBUG(level, fmt, args...) do {} while (0) +#define IEEE80211_DEBUG(level, fmt, args...) ((void)0) #define IEEE80211_DEBUG_DATA(level, data, datalen) do {} while(0) #endif /* CONFIG_IEEE80211_DEBUG */ diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h index 51c150a39fc2..fff57c99bd56 100644 --- a/drivers/staging/rtl8192u/r8192U.h +++ b/drivers/staging/rtl8192u/r8192U.h @@ -122,8 +122,8 @@ extern u32 rt_global_debug_component; } \ } while (0) #else -#define RTL8192U_ASSERT(expr) do {} while (0) -#define RT_DEBUG_DATA(level, data, datalen) do {} while (0) +#define RTL8192U_ASSERT(expr) ((void)0) +#define RT_DEBUG_DATA(level, data, datalen) ((void)0) #endif /* RTL8169_DEBUG */ diff --git a/drivers/staging/rtl8723bs/hal/odm_debug.h b/drivers/staging/rtl8723bs/hal/odm_debug.h index ff131361248c..01eed435fa56 100644 --- a/drivers/staging/rtl8723bs/hal/odm_debug.h +++ b/drivers/staging/rtl8723bs/hal/odm_debug.h @@ -163,8 +163,8 @@ #define ODM_RT_TRACE(pDM_Odm, comp, level, fmt) no_printk fmt #define ODM_RT_TRACE_F(pDM_Odm, comp, level, fmt) no_printk fmt #define ODM_RT_ASSERT(pDM_Odm, expr, fmt) no_printk fmt -#define ODM_dbg_enter() do {} while (0) -#define ODM_dbg_exit() do {} while (0) +#define ODM_dbg_enter() ((void)0) +#define ODM_dbg_exit() ((void)0) #define ODM_dbg_trace(str) no_printk("%s", str) #define ODM_PRINT_ADDR(pDM_Odm, comp, level, title_str, ptr) \ no_printk("%s %p", title_str, ptr) diff --git a/drivers/staging/rtl8723bs/include/osdep_service.h b/drivers/staging/rtl8723bs/include/osdep_service.h index ac9ffe0e3b84..eeb2f7713dda 100644 --- a/drivers/staging/rtl8723bs/include/osdep_service.h +++ b/drivers/staging/rtl8723bs/include/osdep_service.h @@ -94,8 +94,8 @@ typedef enum mstat_status{ MSTAT_FREE } MSTAT_STATUS; -#define rtw_mstat_update(flag, status, sz) do {} while (0) -#define rtw_mstat_dump(sel) do {} while (0) +#define rtw_mstat_update(flag, status, sz) ((void)0) +#define rtw_mstat_dump(sel) ((void)0) u8*_rtw_zmalloc(u32 sz); u8*_rtw_malloc(u32 sz); void _kfree(u8 *pbuf, u32 sz); diff --git a/drivers/staging/rtl8723bs/include/rtw_debug.h b/drivers/staging/rtl8723bs/include/rtw_debug.h index 625e2a39a861..617e46ec9b22 100644 --- a/drivers/staging/rtl8723bs/include/rtw_debug.h +++ b/drivers/staging/rtl8723bs/include/rtw_debug.h @@ -142,10 +142,10 @@ #define RT_TRACE(_Comp, _Level, Fmt) do{}while (0) #define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, _HexDataLen) do{}while (0) -#define DBG_871X(x, ...) do {} while (0) -#define MSG_8192C(x, ...) do {} while (0) -#define DBG_8192C(x,...) do {} while (0) -#define DBG_871X_LEVEL(x,...) do {} while (0) +#define DBG_871X(x, ...) ((void)0) +#define MSG_8192C(x, ...) ((void)0) +#define DBG_8192C(x,...) ((void)0) +#define DBG_871X_LEVEL(x,...) ((void)0) #undef _dbgdump @@ -263,7 +263,7 @@ #ifdef CONFIG_DBG_COUNTER #define DBG_COUNTER(counter) counter++ #else -#define DBG_COUNTER(counter) do {} while (0) +#define DBG_COUNTER(counter) ((void)0) #endif void dump_drv_version(void *sel); diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c index d2c8c4929f93..57f58b9accc7 100644 --- a/drivers/target/iscsi/iscsi_target_parameters.c +++ b/drivers/target/iscsi/iscsi_target_parameters.c @@ -983,7 +983,7 @@ static int iscsi_check_acceptor_state(struct iscsi_param *param, char *value, if (!strcmp(param->value, YES)) acceptor_boolean_value = 1; if (acceptor_boolean_value && proposer_boolean_value) - do {} while (0); + ((void)0); else { if (iscsi_update_param_value(param, NO) < 0) return -1; diff --git a/drivers/tty/n_r3964.c b/drivers/tty/n_r3964.c index 08ac04d08991..2c36bcecaceb 100644 --- a/drivers/tty/n_r3964.c +++ b/drivers/tty/n_r3964.c @@ -87,27 +87,27 @@ #ifdef DEBUG_MODUL #define TRACE_M(format, args...) printk("r3964: " format "\n" , ## args) #else -#define TRACE_M(fmt, arg...) do {} while (0) +#define TRACE_M(fmt, arg...) ((void)0) #endif #ifdef DEBUG_PROTO_S #define TRACE_PS(format, args...) printk("r3964: " format "\n" , ## args) #else -#define TRACE_PS(fmt, arg...) do {} while (0) +#define TRACE_PS(fmt, arg...) ((void)0) #endif #ifdef DEBUG_PROTO_E #define TRACE_PE(format, args...) printk("r3964: " format "\n" , ## args) #else -#define TRACE_PE(fmt, arg...) do {} while (0) +#define TRACE_PE(fmt, arg...) ((void)0) #endif #ifdef DEBUG_LDISC #define TRACE_L(format, args...) printk("r3964: " format "\n" , ## args) #else -#define TRACE_L(fmt, arg...) do {} while (0) +#define TRACE_L(fmt, arg...) ((void)0) #endif #ifdef DEBUG_QUEUE #define TRACE_Q(format, args...) printk("r3964: " format "\n" , ## args) #else -#define TRACE_Q(fmt, arg...) do {} while (0) +#define TRACE_Q(fmt, arg...) ((void)0) #endif static void add_tx_queue(struct r3964_info *, struct r3964_block_header *); static void remove_from_tx_queue(struct r3964_info *pInfo, int error_code); diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c index 467f401abd29..974019cb185b 100644 --- a/drivers/tty/pty.c +++ b/drivers/tty/pty.c @@ -34,7 +34,7 @@ #ifdef TTY_DEBUG_HANGUP # define tty_debug_hangup(tty, f, args...) tty_debug(tty, f, ##args) #else -# define tty_debug_hangup(tty, f, args...) do {} while (0) +# define tty_debug_hangup(tty, f, args...) ((void)0) #endif #ifdef CONFIG_UNIX98_PTYS diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c index 0339a3856c13..b23f8f6d3b8c 100644 --- a/drivers/tty/tty_ioctl.c +++ b/drivers/tty/tty_ioctl.c @@ -29,7 +29,7 @@ #ifdef TTY_DEBUG_WAIT_UNTIL_SENT # define tty_debug_wait_until_sent(tty, f, args...) tty_debug(tty, f, ##args) #else -# define tty_debug_wait_until_sent(tty, f, args...) do {} while (0) +# define tty_debug_wait_until_sent(tty, f, args...) ((void)0) #endif #undef DEBUG diff --git a/drivers/usb/common/usb-otg-fsm.c b/drivers/usb/common/usb-otg-fsm.c index a8b91f825e1a..7700b29d3253 100644 --- a/drivers/usb/common/usb-otg-fsm.c +++ b/drivers/usb/common/usb-otg-fsm.c @@ -35,7 +35,7 @@ #define VDBG(fmt, args...) pr_debug("[%s] " fmt, \ __func__, ## args) #else -#define VDBG(stuff...) do {} while (0) +#define VDBG(stuff...) ((void)0) #endif /* Change USB protocol when there is a protocol change */ diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c index ecbd5963d96e..267253a1cad8 100644 --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c @@ -676,10 +676,10 @@ static void remove_power_attributes(struct device *dev) #else #define add_persist_attributes(dev) 0 -#define remove_persist_attributes(dev) do {} while (0) +#define remove_persist_attributes(dev) ((void)0) #define add_power_attributes(dev) 0 -#define remove_power_attributes(dev) do {} while (0) +#define remove_power_attributes(dev) ((void)0) #endif /* CONFIG_PM */ diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index adee245f9cde..2a57a6e530b0 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h @@ -107,7 +107,7 @@ static inline int usb_port_resume(struct usb_device *udev, pm_message_t msg) return 0; } -#define usb_autosuspend_device(udev) do {} while (0) +#define usb_autosuspend_device(udev) ((void)0) static inline int usb_autoresume_device(struct usb_device *udev) { return 0; diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h index 2f1fb3a9b051..151b9b670c51 100644 --- a/drivers/usb/dwc2/core.h +++ b/drivers/usb/dwc2/core.h @@ -262,7 +262,7 @@ do { \ } \ } while (0) #else -#define call_gadget(_hs, _entry) do {} while (0) +#define call_gadget(_hs, _entry) ((void)0) #endif struct dwc2_hsotg; diff --git a/drivers/usb/dwc2/hcd.h b/drivers/usb/dwc2/hcd.h index 1a7689d1cb8d..5b95442d0fd3 100644 --- a/drivers/usb/dwc2/hcd.h +++ b/drivers/usb/dwc2/hcd.h @@ -853,7 +853,7 @@ do { \ } \ } while (0) #else -#define dwc2_sample_frrem(_hcd_, _qh_, _letter_) do {} while (0) +#define dwc2_sample_frrem(_hcd_, _qh_, _letter_) ((void)0) #endif #endif /* __DWC2_HCD_H__ */ diff --git a/drivers/usb/gadget/ci13xxx_udc.h b/drivers/usb/gadget/ci13xxx_udc.h index 8c930803bcb3..a2c7f701271a 100644 --- a/drivers/usb/gadget/ci13xxx_udc.h +++ b/drivers/usb/gadget/ci13xxx_udc.h @@ -275,8 +275,8 @@ do { \ #define trace(format, args...) ci13xxx_printk(KERN_DEBUG, format, ## args) #define dbg_trace(format, args...) dev_dbg(dev, format, ##args) #else -#define trace(format, args...) do {} while (0) -#define dbg_trace(format, args...) do {} while (0) +#define trace(format, args...) ((void)0) +#define dbg_trace(format, args...) ((void)0) #endif #endif /* _CI13XXX_h_ */ diff --git a/drivers/usb/gadget/legacy/ether.c b/drivers/usb/gadget/legacy/ether.c index 3396e7193dba..6d02d1674fd5 100644 --- a/drivers/usb/gadget/legacy/ether.c +++ b/drivers/usb/gadget/legacy/ether.c @@ -100,7 +100,7 @@ static inline bool has_rndis(void) #include "u_rndis.h" #include "rndis.h" #else -#define rndis_borrow_net(...) do {} while (0) +#define rndis_borrow_net(...) ((void)0) #endif #include "u_eem.h" diff --git a/drivers/usb/gadget/udc/amd5536udc.h b/drivers/usb/gadget/udc/amd5536udc.h index 4fe22d432af2..c8ac5dc2b0d7 100644 --- a/drivers/usb/gadget/udc/amd5536udc.h +++ b/drivers/usb/gadget/udc/amd5536udc.h @@ -660,7 +660,7 @@ MODULE_PARM_DESC(use_fullspeed, "true for fullspeed only"); #ifdef UDC_VERBOSE #define VDBG DBG #else -#define VDBG(udc , args...) do {} while (0) +#define VDBG(udc , args...) ((void)0) #endif #endif /* #ifdef AMD5536UDC_H */ diff --git a/drivers/usb/gadget/udc/fsl_udc_core.c b/drivers/usb/gadget/udc/fsl_udc_core.c index b57b95d6134a..fc3dad0482eb 100644 --- a/drivers/usb/gadget/udc/fsl_udc_core.c +++ b/drivers/usb/gadget/udc/fsl_udc_core.c @@ -2231,8 +2231,8 @@ static const struct file_operations fsl_proc_fops = { #else /* !CONFIG_USB_GADGET_DEBUG_FILES */ -#define create_proc_file() do {} while (0) -#define remove_proc_file() do {} while (0) +#define create_proc_file() ((void)0) +#define remove_proc_file() ((void)0) #endif /* CONFIG_USB_GADGET_DEBUG_FILES */ diff --git a/drivers/usb/gadget/udc/pxa25x_udc.c b/drivers/usb/gadget/udc/pxa25x_udc.c index a238da906115..8f5c1ba61381 100644 --- a/drivers/usb/gadget/udc/pxa25x_udc.c +++ b/drivers/usb/gadget/udc/pxa25x_udc.c @@ -1363,8 +1363,8 @@ static const struct file_operations debug_fops = { #else /* !CONFIG_USB_GADGET_DEBUG_FILES */ -#define create_debug_files(dev) do {} while (0) -#define remove_debug_files(dev) do {} while (0) +#define create_debug_files(dev) ((void)0) +#define remove_debug_files(dev) ((void)0) #endif /* CONFIG_USB_GADGET_DEBUG_FILES */ diff --git a/drivers/usb/gadget/udc/pxa27x_udc.c b/drivers/usb/gadget/udc/pxa27x_udc.c index d48e239660c3..6958e1501126 100644 --- a/drivers/usb/gadget/udc/pxa27x_udc.c +++ b/drivers/usb/gadget/udc/pxa27x_udc.c @@ -2554,7 +2554,7 @@ static void pxa_udc_shutdown(struct platform_device *_dev) #ifdef CONFIG_PXA27x extern void pxa27x_clear_otgph(void); #else -#define pxa27x_clear_otgph() do {} while (0) +#define pxa27x_clear_otgph() ((void)0) #endif #ifdef CONFIG_PM diff --git a/drivers/usb/host/isp1362.h b/drivers/usb/host/isp1362.h index da79e36ced89..57f42eac52f8 100644 --- a/drivers/usb/host/isp1362.h +++ b/drivers/usb/host/isp1362.h @@ -58,7 +58,7 @@ static inline void delayed_insw(unsigned int addr, void *buf, int len) #define USE_PLATFORM_DELAY 0 #define USE_NDELAY 0 -#define DUMMY_DELAY_ACCESS do {} while (0) +#define DUMMY_DELAY_ACCESS ((void)0) #endif @@ -104,8 +104,8 @@ typedef const unsigned char isp1362_reg_t; #define ISP1362_REG(name, addr, width, rw) \ static isp1362_reg_t ISP1362_REG_##name = addr -#define REG_ACCESS_TEST(r) do {} while (0) -#define REG_WIDTH_TEST(r, w) do {} while (0) +#define REG_ACCESS_TEST(r) ((void)0) +#define REG_WIDTH_TEST(r, w) ((void)0) #endif /* OHCI compatible registers */ @@ -592,19 +592,19 @@ static inline struct usb_hcd *isp1362_hcd_to_hcd(struct isp1362_hcd *isp1362_hcd #ifdef VERBOSE # define VDBG(fmt...) DBG(3, fmt) #else -# define VDBG(fmt...) do {} while (0) +# define VDBG(fmt...) ((void)0) #endif #ifdef REGISTERS # define RDBG(fmt...) DBG(1, fmt) #else -# define RDBG(fmt...) do {} while (0) +# define RDBG(fmt...) ((void)0) #endif #ifdef URB_TRACE #define URB_DBG(fmt...) DBG(0, fmt) #else -#define URB_DBG(fmt...) do {} while (0) +#define URB_DBG(fmt...) ((void)0) #endif @@ -616,7 +616,7 @@ static inline struct usb_hcd *isp1362_hcd_to_hcd(struct isp1362_hcd *isp1362_hcd #elif USE_NDELAY #define isp1362_delay(h, d) ndelay(d) #else -#define isp1362_delay(h, d) do {} while (0) +#define isp1362_delay(h, d) ((void)0) #endif #define get_urb(ep) ({ \ @@ -1007,9 +1007,9 @@ static void dump_ptd_queue(struct isp1362_ep_queue *epq) dbg_level = dbg; } #else -#define dump_ptd(ptd) do {} while (0) -#define dump_ptd_in_data(ptd, buf) do {} while (0) -#define dump_ptd_out_data(ptd, buf) do {} while (0) -#define dump_ptd_data(ptd, buf) do {} while (0) -#define dump_ptd_queue(epq) do {} while (0) +#define dump_ptd(ptd) ((void)0) +#define dump_ptd_in_data(ptd, buf) ((void)0) +#define dump_ptd_out_data(ptd, buf) ((void)0) +#define dump_ptd_data(ptd, buf) ((void)0) +#define dump_ptd_queue(epq) ((void)0) #endif diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index ebd437c43f83..f78b2ecb7714 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c @@ -269,7 +269,7 @@ static inline void pxa27x_reset_hc(struct pxa27x_ohci *pxa_ohci) #ifdef CONFIG_PXA27x extern void pxa27x_clear_otgph(void); #else -#define pxa27x_clear_otgph() do {} while (0) +#define pxa27x_clear_otgph() ((void)0) #endif static int pxa27x_start_hc(struct pxa27x_ohci *pxa_ohci, struct device *dev) diff --git a/drivers/usb/musb/blackfin.h b/drivers/usb/musb/blackfin.h index c84dae546dc6..c0343e7a3a51 100644 --- a/drivers/usb/musb/blackfin.h +++ b/drivers/usb/musb/blackfin.h @@ -66,7 +66,7 @@ static void dump_fifo_data(u8 *buf, u16 len) pr_debug("\n"); } #else -#define dump_fifo_data(buf, len) do {} while (0) +#define dump_fifo_data(buf, len) ((void)0) #endif diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c index 968900c36451..1f5eb836f647 100644 --- a/drivers/usb/phy/phy-fsl-usb.c +++ b/drivers/usb/phy/phy-fsl-usb.c @@ -48,7 +48,7 @@ #define VDBG(fmt, args...) pr_debug("[%s] " fmt, \ __func__, ## args) #else -#define VDBG(stuff...) do {} while (0) +#define VDBG(stuff...) ((void)0) #endif #define DRIVER_VERSION "Rev. 1.55" diff --git a/drivers/video/fbdev/au1100fb.h b/drivers/video/fbdev/au1100fb.h index 9af19939a9c6..fde23164946f 100644 --- a/drivers/video/fbdev/au1100fb.h +++ b/drivers/video/fbdev/au1100fb.h @@ -39,7 +39,7 @@ #if DEBUG #define print_dbg(f, arg...) printk(__FILE__ ": " f "\n", ## arg) #else -#define print_dbg(f, arg...) do {} while (0) +#define print_dbg(f, arg...) ((void)0) #endif #if defined(__BIG_ENDIAN) diff --git a/drivers/video/fbdev/au1200fb.c b/drivers/video/fbdev/au1200fb.c index cae4a04cba48..306eb5da5d2e 100644 --- a/drivers/video/fbdev/au1200fb.c +++ b/drivers/video/fbdev/au1200fb.c @@ -61,7 +61,7 @@ #if DEBUG #define print_dbg(f, arg...) printk(KERN_DEBUG __FILE__ ": " f "\n", ## arg) #else -#define print_dbg(f, arg...) do {} while (0) +#define print_dbg(f, arg...) ((void)0) #endif diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c index 68e4bcdd3871..b7c4cff5d0e4 100644 --- a/drivers/video/fbdev/nvidia/nvidia.c +++ b/drivers/video/fbdev/nvidia/nvidia.c @@ -989,8 +989,8 @@ static void restore_vga_x86(struct nvidia_par *par) restore_vga(&par->vgastate); } #else -#define save_vga_x86(x) do {} while (0) -#define restore_vga_x86(x) do {} while (0) +#define save_vga_x86(x) ((void)0) +#define restore_vga_x86(x) ((void)0) #endif /* X86 */ static int nvidiafb_open(struct fb_info *info, int user) diff --git a/drivers/video/fbdev/pxa3xx-gcu.c b/drivers/video/fbdev/pxa3xx-gcu.c index db861bb39150..e63d12ca5b5f 100644 --- a/drivers/video/fbdev/pxa3xx-gcu.c +++ b/drivers/video/fbdev/pxa3xx-gcu.c @@ -79,7 +79,7 @@ QPRINT(priv, KERN_DEBUG, msg); \ } while (0) #else -#define QDUMP(msg) do {} while (0) +#define QDUMP(msg) ((void)0) #endif #define QERROR(msg) \ diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c index 08ee77d5df8b..fcc616de18ac 100644 --- a/drivers/video/fbdev/pxafb.c +++ b/drivers/video/fbdev/pxafb.c @@ -2094,7 +2094,7 @@ static void pxafb_check_options(struct device *dev, struct pxafb_mach_info *inf) "passive mode\n"); } #else -#define pxafb_check_options(...) do {} while (0) +#define pxafb_check_options(...) ((void)0) #endif #if defined(CONFIG_OF) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 6bb19c20942a..ec109bccac36 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -92,10 +92,10 @@ static inline void __btrfs_debug_check_extent_io_range(const char *caller, start, end); } #else -#define btrfs_leak_debug_add(new, head) do {} while (0) -#define btrfs_leak_debug_del(entry) do {} while (0) -#define btrfs_leak_debug_check() do {} while (0) -#define btrfs_debug_check_extent_io_range(c, s, e) do {} while (0) +#define btrfs_leak_debug_add(new, head) ((void)0) +#define btrfs_leak_debug_del(entry) ((void)0) +#define btrfs_leak_debug_check() ((void)0) +#define btrfs_debug_check_extent_io_range(c, s, e) ((void)0) #endif #define BUFFER_LRU_MAX 64 diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h index bb3a02ca9da4..541cda90ea32 100644 --- a/fs/cachefiles/internal.h +++ b/fs/cachefiles/internal.h @@ -200,8 +200,8 @@ void cachefiles_hist(atomic_t histogram[], unsigned long start_jif) #else #define cachefiles_proc_init() (0) -#define cachefiles_proc_cleanup() do {} while (0) -#define cachefiles_hist(hist, start_jif) do {} while (0) +#define cachefiles_proc_cleanup() ((void)0) +#define cachefiles_hist(hist, start_jif) ((void)0) #endif /* @@ -360,9 +360,9 @@ do { \ #else -#define ASSERT(X) do {} while (0) -#define ASSERTCMP(X, OP, Y) do {} while (0) -#define ASSERTIF(C, X) do {} while (0) -#define ASSERTIFCMP(C, X, OP, Y) do {} while (0) +#define ASSERT(X) ((void)0) +#define ASSERTCMP(X, OP, Y) ((void)0) +#define ASSERTIF(C, X) ((void)0) +#define ASSERTIFCMP(C, X, OP, Y) ((void)0) #endif diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index f166fcb48ac0..78f69f251c79 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -1307,9 +1307,9 @@ static inline void cifs_stats_bytes_read(struct cifs_tcon *tcon, } #else -#define cifs_stats_inc(field) do {} while (0) -#define cifs_stats_bytes_written(tcon, bytes) do {} while (0) -#define cifs_stats_bytes_read(tcon, bytes) do {} while (0) +#define cifs_stats_inc(field) ((void)0) +#define cifs_stats_bytes_written(tcon, bytes) ((void)0) +#define cifs_stats_bytes_read(tcon, bytes) ((void)0) #endif diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c index f17715d140b5..b9c94219cf6c 100644 --- a/fs/exofs/inode.c +++ b/fs/exofs/inode.c @@ -35,7 +35,7 @@ #include "exofs.h" -#define EXOFS_DBGMSG2(M...) do {} while (0) +#define EXOFS_DBGMSG2(M...) ((void)0) unsigned exofs_max_io_pages(struct ore_layout *layout, unsigned expected_pages) diff --git a/fs/exofs/ore_raid.h b/fs/exofs/ore_raid.h index a6e746775570..fc525614f897 100644 --- a/fs/exofs/ore_raid.h +++ b/fs/exofs/ore_raid.h @@ -28,7 +28,7 @@ /* u64 has problems with printk this will cast it to unsigned long long */ #define _LLU(x) (unsigned long long)(x) -#define ORE_DBGMSG2(M...) do {} while (0) +#define ORE_DBGMSG2(M...) ((void)0) /* #define ORE_DBGMSG2 ORE_DBGMSG */ /* ios_raid.c stuff needed by ios.c */ diff --git a/fs/exofs/super.c b/fs/exofs/super.c index 881d5798a181..740dc8a2ebdb 100644 --- a/fs/exofs/super.c +++ b/fs/exofs/super.c @@ -41,7 +41,7 @@ #include "exofs.h" -#define EXOFS_DBGMSG2(M...) do {} while (0) +#define EXOFS_DBGMSG2(M...) ((void)0) /****************************************************************************** * MOUNT OPTIONS diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c index ccd5a7016c19..25f356144b0b 100644 --- a/fs/ext2/balloc.c +++ b/fs/ext2/balloc.c @@ -241,7 +241,7 @@ restart: #define rsv_window_dump(root, verbose) \ __rsv_window_dump((root), (verbose), __func__) #else -#define rsv_window_dump(root, verbose) do {} while (0) +#define rsv_window_dump(root, verbose) ((void)0) #endif /** diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h index 97ec45110957..424af7f72509 100644 --- a/fs/fscache/internal.h +++ b/fs/fscache/internal.h @@ -78,7 +78,7 @@ static inline void fscache_hist(atomic_t histogram[], unsigned long start_jif) extern const struct file_operations fscache_histogram_fops; #else -#define fscache_hist(hist, start_jif) do {} while (0) +#define fscache_hist(hist, start_jif) ((void)0) #endif /* @@ -148,7 +148,7 @@ extern int __init fscache_proc_init(void); extern void fscache_proc_cleanup(void); #else #define fscache_proc_init() (0) -#define fscache_proc_cleanup() do {} while (0) +#define fscache_proc_cleanup() ((void)0) #endif /* @@ -291,8 +291,8 @@ extern const struct file_operations fscache_stats_fops; #else #define __fscache_stat(stat) (NULL) -#define fscache_stat(stat) do {} while (0) -#define fscache_stat_d(stat) do {} while (0) +#define fscache_stat(stat) ((void)0) +#define fscache_stat_d(stat) ((void)0) #endif /* @@ -460,9 +460,9 @@ do { \ #else -#define ASSERT(X) do {} while (0) -#define ASSERTCMP(X, OP, Y) do {} while (0) -#define ASSERTIF(C, X) do {} while (0) -#define ASSERTIFCMP(C, X, OP, Y) do {} while (0) +#define ASSERT(X) ((void)0) +#define ASSERTCMP(X, OP, Y) ((void)0) +#define ASSERTIF(C, X) ((void)0) +#define ASSERTIFCMP(C, X, OP, Y) ((void)0) #endif /* assert or not */ diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index f96da7ed4189..deb61f6c7d29 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -2646,8 +2646,8 @@ static void __exit jbd2_remove_jbd_stats_proc_entry(void) #else -#define jbd2_create_jbd_stats_proc_entry() do {} while (0) -#define jbd2_remove_jbd_stats_proc_entry() do {} while (0) +#define jbd2_create_jbd_stats_proc_entry() ((void)0) +#define jbd2_remove_jbd_stats_proc_entry() ((void)0) #endif diff --git a/fs/jffs2/os-linux.h b/fs/jffs2/os-linux.h index 824e61ede465..e8ca93899b1b 100644 --- a/fs/jffs2/os-linux.h +++ b/fs/jffs2/os-linux.h @@ -88,14 +88,14 @@ static inline void jffs2_init_inode_info(struct jffs2_inode_info *f) #define jffs2_wbuf_process NULL #define jffs2_dataflash(c) (0) #define jffs2_dataflash_setup(c) (0) -#define jffs2_dataflash_cleanup(c) do {} while (0) +#define jffs2_dataflash_cleanup(c) ((void)0) #define jffs2_nor_wbuf_flash(c) (0) #define jffs2_nor_wbuf_flash_setup(c) (0) -#define jffs2_nor_wbuf_flash_cleanup(c) do {} while (0) +#define jffs2_nor_wbuf_flash_cleanup(c) ((void)0) #define jffs2_ubivol(c) (0) #define jffs2_ubivol_setup(c) (0) -#define jffs2_ubivol_cleanup(c) do {} while (0) -#define jffs2_dirty_trigger(c) do {} while (0) +#define jffs2_ubivol_cleanup(c) ((void)0) +#define jffs2_dirty_trigger(c) ((void)0) #else /* NAND and/or ECC'd NOR support present */ diff --git a/fs/jfs/jfs_debug.h b/fs/jfs/jfs_debug.h index eafd1300a00b..90f741d47e5c 100644 --- a/fs/jfs/jfs_debug.h +++ b/fs/jfs/jfs_debug.h @@ -93,11 +93,11 @@ extern const struct file_operations jfs_txanchor_proc_fops; * --------- */ #else /* CONFIG_JFS_DEBUG */ -#define ASSERT(p) do {} while (0) -#define jfs_info(fmt, arg...) do {} while (0) -#define jfs_debug(fmt, arg...) do {} while (0) -#define jfs_warn(fmt, arg...) do {} while (0) -#define jfs_err(fmt, arg...) do {} while (0) +#define ASSERT(p) ((void)0) +#define jfs_info(fmt, arg...) ((void)0) +#define jfs_debug(fmt, arg...) ((void)0) +#define jfs_warn(fmt, arg...) ((void)0) +#define jfs_err(fmt, arg...) ((void)0) #endif /* CONFIG_JFS_DEBUG */ /* diff --git a/fs/ntfs/debug.h b/fs/ntfs/debug.h index 61bf091e32a8..3ed55a08f977 100644 --- a/fs/ntfs/debug.h +++ b/fs/ntfs/debug.h @@ -54,7 +54,7 @@ do { \ no_printk(fmt, ##__VA_ARGS__); \ } while (0) -#define ntfs_debug_dump_runlist(rl) do {} while (0) +#define ntfs_debug_dump_runlist(rl) ((void)0) #endif /* !DEBUG */ diff --git a/include/asm-generic/fb.h b/include/asm-generic/fb.h index f9f18101ed36..1c48f835a296 100644 --- a/include/asm-generic/fb.h +++ b/include/asm-generic/fb.h @@ -3,7 +3,7 @@ #define __ASM_GENERIC_FB_H_ #include -#define fb_pgprotect(...) do {} while (0) +#define fb_pgprotect(...) ((void)0) static inline int fb_is_primary_device(struct fb_info *info) { diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index b4531e3b2120..c2d18d74fef1 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -22,7 +22,7 @@ #include #ifndef mmiowb -#define mmiowb() do {} while (0) +#define mmiowb() ((void)0) #endif /* diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 6727086a333f..644dd131f1e4 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -639,9 +639,9 @@ static inline void ptep_modify_prot_commit(struct mm_struct *mm, * it must synchronize the delayed page table writes properly on other CPUs. */ #ifndef __HAVE_ARCH_ENTER_LAZY_MMU_MODE -#define arch_enter_lazy_mmu_mode() do {} while (0) -#define arch_leave_lazy_mmu_mode() do {} while (0) -#define arch_flush_lazy_mmu_mode() do {} while (0) +#define arch_enter_lazy_mmu_mode() ((void)0) +#define arch_leave_lazy_mmu_mode() ((void)0) +#define arch_flush_lazy_mmu_mode() ((void)0) #endif /* @@ -656,7 +656,7 @@ static inline void ptep_modify_prot_commit(struct mm_struct *mm, * definition. */ #ifndef __HAVE_ARCH_START_CONTEXT_SWITCH -#define arch_start_context_switch(prev) do {} while (0) +#define arch_start_context_switch(prev) ((void)0) #endif #ifdef CONFIG_HAVE_ARCH_SOFT_DIRTY diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index 43409a047480..f72eee71a5c6 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -232,7 +232,7 @@ static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb, * This is a nop so far, because only x86 needs it. */ #ifndef __tlb_remove_pmd_tlb_entry -#define __tlb_remove_pmd_tlb_entry(tlb, pmdp, address) do {} while (0) +#define __tlb_remove_pmd_tlb_entry(tlb, pmdp, address) ((void)0) #endif #define tlb_remove_pmd_tlb_entry(tlb, pmdp, address) \ @@ -246,7 +246,7 @@ static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb, * invalidation. This is a nop so far, because only x86 needs it. */ #ifndef __tlb_remove_pud_tlb_entry -#define __tlb_remove_pud_tlb_entry(tlb, pudp, address) do {} while (0) +#define __tlb_remove_pud_tlb_entry(tlb, pudp, address) ((void)0) #endif #define tlb_remove_pud_tlb_entry(tlb, pudp, address) \ @@ -301,6 +301,6 @@ static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb, } while (0) #endif -#define tlb_migrate_finish(mm) do {} while (0) +#define tlb_migrate_finish(mm) ((void)0) #endif /* _ASM_GENERIC__TLB_H */ diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index 3b6ff5902edc..a640c1de2c77 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h @@ -90,7 +90,7 @@ extern struct attribute_group blk_trace_attr_group; #else /* !CONFIG_BLK_DEV_IO_TRACE */ # define blk_trace_ioctl(bdev, cmd, arg) (-ENOTTY) # define blk_trace_shutdown(q) do { } while (0) -# define blk_add_driver_data(q, rq, data, len) do {} while (0) +# define blk_add_driver_data(q, rq, data, len) ((void)0) # define blk_trace_setup(q, name, dev, bdev, arg) (-ENOTTY) # define blk_trace_startstop(q, start) (-ENOTTY) # define blk_trace_remove(q) (-ENOTTY) diff --git a/include/linux/cb710.h b/include/linux/cb710.h index 8cc10411bab2..d9cd57b53548 100644 --- a/include/linux/cb710.h +++ b/include/linux/cb710.h @@ -109,7 +109,7 @@ static inline struct device *cb710_chip_dev(struct cb710_chip *chip) #ifdef CONFIG_CB710_DEBUG void cb710_dump_regs(struct cb710_chip *chip, unsigned dump); #else -#define cb710_dump_regs(c, d) do {} while (0) +#define cb710_dump_regs(c, d) ((void)0) #endif #define CB710_DUMP_REGS_MMC 0x0F diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h index 604967609e55..b5f9a4fd3be8 100644 --- a/include/linux/genl_magic_func.h +++ b/include/linux/genl_magic_func.h @@ -117,9 +117,9 @@ static void dprint_array(const char *dir, int nla_type, nla_data(nla), nla_len(nla)); \ } while (0) #else -#define DPRINT_TLA(a, op, b) do {} while (0) -#define DPRINT_FIELD(dir, nla_type, name, s, nla) do {} while (0) -#define DPRINT_ARRAY(dir, nla_type, name, s, nla) do {} while (0) +#define DPRINT_TLA(a, op, b) ((void)0) +#define DPRINT_FIELD(dir, nla_type, name, s, nla) ((void)0) +#define DPRINT_ARRAY(dir, nla_type, name, s, nla) ((void)0) #endif /* diff --git a/include/linux/highmem.h b/include/linux/highmem.h index b471a881f326..e290ee08358d 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -88,7 +88,7 @@ static inline void __kunmap_atomic(void *addr) #define kmap_atomic_pfn(pfn) kmap_atomic(pfn_to_page(pfn)) #define kmap_flush_unused() do {} while(0) -#define kmap_atomic_flush_unused() do {} while (0) +#define kmap_atomic_flush_unused() ((void)0) #endif #endif /* CONFIG_HIGHMEM */ diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index e52e6bed5b44..6841432518f1 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -210,7 +210,7 @@ static inline bool isolate_huge_page(struct page *page, struct list_head *list) { return false; } -#define putback_active_hugepage(p) do {} while (0) +#define putback_active_hugepage(p) ((void)0) static inline unsigned long hugetlb_change_protection(struct vm_area_struct *vma, unsigned long address, unsigned long end, pgprot_t newprot) diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index da783a7c9be1..842f3df9bcb7 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -1650,12 +1650,12 @@ static inline tid_t jbd2_get_latest_transaction(journal_t *journal) #ifdef __KERNEL__ -#define buffer_trace_init(bh) do {} while (0) -#define print_buffer_fields(bh) do {} while (0) -#define print_buffer_trace(bh) do {} while (0) -#define BUFFER_TRACE(bh, info) do {} while (0) -#define BUFFER_TRACE2(bh, bh2, info) do {} while (0) -#define JBUFFER_TRACE(jh, info) do {} while (0) +#define buffer_trace_init(bh) ((void)0) +#define print_buffer_fields(bh) ((void)0) +#define print_buffer_trace(bh) ((void)0) +#define BUFFER_TRACE(bh, info) ((void)0) +#define BUFFER_TRACE2(bh, bh2, info) ((void)0) +#define JBUFFER_TRACE(jh, info) ((void)0) #endif /* __KERNEL__ */ diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index 3d7217e54f70..9b3a110e9a4e 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -586,7 +586,7 @@ extern void lockdep_invariant_state(bool force); extern void lockdep_init_task(struct task_struct *task); extern void lockdep_free_task(struct task_struct *task); #else /* !CROSSRELEASE */ -#define lockdep_init_map_crosslock(m, n, k, s) do {} while (0) +#define lockdep_init_map_crosslock(m, n, k, s) ((void)0) /* * To initialize a lockdep_map statically use this macro. * Note that _name must not be NULL. @@ -629,8 +629,8 @@ do { \ #else /* CONFIG_LOCK_STAT */ -#define lock_contended(lockdep_map, ip) do {} while (0) -#define lock_acquired(lockdep_map, ip) do {} while (0) +#define lock_contended(lockdep_map, ip) ((void)0) +#define lock_acquired(lockdep_map, ip) ((void)0) #define LOCK_CONTENDED(_lock, try, lock) \ lock(_lock) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 0e5537c99490..66a5cb466761 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1514,8 +1514,8 @@ static inline int pfn_present(unsigned long pfn) #define early_pfn_valid(pfn) pfn_valid(pfn) void sparse_init(void); #else -#define sparse_init() do {} while (0) -#define sparse_index_init(_sec, _nid) do {} while (0) +#define sparse_init() ((void)0) +#define sparse_index_init(_sec, _nid) ((void)0) #endif /* CONFIG_SPARSEMEM */ /* diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h index 59066a3872c3..c959bc1ae2d2 100644 --- a/include/linux/nodemask.h +++ b/include/linux/nodemask.h @@ -515,7 +515,7 @@ static inline int node_random(const nodemask_t *mask) #define NODEMASK_FREE(m) kfree(m) #else #define NODEMASK_ALLOC(type, name, gfp_flags) type _##name, *name = &_##name -#define NODEMASK_FREE(m) do {} while (0) +#define NODEMASK_FREE(m) ((void)0) #endif /* A example struture for using NODEMASK_ALLOC, used in mempolicy. */ diff --git a/include/linux/platform_data/keypad-omap.h b/include/linux/platform_data/keypad-omap.h index c3a3abae98f0..442f905fe070 100644 --- a/include/linux/platform_data/keypad-omap.h +++ b/include/linux/platform_data/keypad-omap.h @@ -11,7 +11,7 @@ #ifndef CONFIG_ARCH_OMAP1 #warning Please update the board to use matrix-keypad driver #define omap_readw(reg) 0 -#define omap_writew(val, reg) do {} while (0) +#define omap_writew(val, reg) ((void)0) #endif #include diff --git a/include/linux/pm.h b/include/linux/pm.h index 0714ad847811..9d63859fdc73 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -741,15 +741,15 @@ extern void pm_complete_with_resume_check(struct device *dev); #else /* !CONFIG_PM_SLEEP */ -#define device_pm_lock() do {} while (0) -#define device_pm_unlock() do {} while (0) +#define device_pm_lock() ((void)0) +#define device_pm_unlock() ((void)0) static inline int dpm_suspend_start(pm_message_t state) { return 0; } -#define suspend_report_result(fn, ret) do {} while (0) +#define suspend_report_result(fn, ret) ((void)0) static inline int device_pm_wait_for_dev(struct device *a, struct device *b) { diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 13112f4c4d53..1b27954ba7e9 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -67,7 +67,7 @@ static inline void *PDE_DATA(const struct inode *inode) {BUG(); return NULL;} static inline void *proc_get_parent_data(const struct inode *inode) { BUG(); return NULL; } static inline void proc_remove(struct proc_dir_entry *de) {} -#define remove_proc_entry(name, parent) do {} while (0) +#define remove_proc_entry(name, parent) ((void)0) static inline int remove_proc_subtree(const char *name, struct proc_dir_entry *parent) { return 0; } static inline struct pid *tgid_pidfd_to_pid(const struct file *file) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index dfc799ca8633..b5ea39643336 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -297,9 +297,9 @@ void rmap_walk_locked(struct page *page, struct rmap_walk_control *rwc); #else /* !CONFIG_MMU */ -#define anon_vma_init() do {} while (0) +#define anon_vma_init() ((void)0) #define anon_vma_prepare(vma) (0) -#define anon_vma_link(vma) do {} while (0) +#define anon_vma_link(vma) ((void)0) static inline int page_referenced(struct page *page, int is_locked, struct mem_cgroup *memcg, diff --git a/include/linux/smp.h b/include/linux/smp.h index 15835ed84698..a77c5317a39d 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h @@ -153,7 +153,7 @@ static inline int up_smp_call_function(smp_call_func_t func, void *info) (up_smp_call_function(func, info)) static inline void smp_send_reschedule(int cpu) { } -#define smp_prepare_boot_cpu() do {} while (0) +#define smp_prepare_boot_cpu() ((void)0) #define smp_call_function_many(mask, func, info, wait) \ (up_smp_call_function(func, info)) static inline void call_function_init(void) { } diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h index f6aeed07fe04..e0e9fd6a8f74 100644 --- a/include/linux/sunrpc/debug.h +++ b/include/linux/sunrpc/debug.h @@ -67,9 +67,9 @@ do { \ # define RPC_IFDEBUG(x) x #else # define ifdebug(fac) if (0) -# define dfprintk(fac, fmt, ...) do {} while (0) -# define dfprintk_cont(fac, fmt, ...) do {} while (0) -# define dfprintk_rcu(fac, fmt, ...) do {} while (0) +# define dfprintk(fac, fmt, ...) ((void)0) +# define dfprintk_cont(fac, fmt, ...) ((void)0) +# define dfprintk_rcu(fac, fmt, ...) ((void)0) # define RPC_IFDEBUG(x) #endif diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index d19211a4502b..a56d9dbf22f8 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h @@ -55,7 +55,7 @@ do { \ (attr)->key = &__key; \ } while (0) #else -#define sysfs_attr_init(attr) do {} while (0) +#define sysfs_attr_init(attr) ((void)0) #endif /** diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index 1e0cb72e0598..47f85f86cc24 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -83,7 +83,7 @@ static inline void vm_events_fold_cpu(int cpu) #define count_vm_numa_event(x) count_vm_event(x) #define count_vm_numa_events(x, y) count_vm_events(x, y) #else -#define count_vm_numa_event(x) do {} while (0) +#define count_vm_numa_event(x) ((void)0) #define count_vm_numa_events(x, y) do { (void)(y); } while (0) #endif /* CONFIG_NUMA_BALANCING */ @@ -91,14 +91,14 @@ static inline void vm_events_fold_cpu(int cpu) #define count_vm_tlb_event(x) count_vm_event(x) #define count_vm_tlb_events(x, y) count_vm_events(x, y) #else -#define count_vm_tlb_event(x) do {} while (0) +#define count_vm_tlb_event(x) ((void)0) #define count_vm_tlb_events(x, y) do { (void)(y); } while (0) #endif #ifdef CONFIG_DEBUG_VM_VMACACHE #define count_vm_vmacache_event(x) count_vm_event(x) #else -#define count_vm_vmacache_event(x) do {} while (0) +#define count_vm_vmacache_event(x) ((void)0) #endif #define __count_zid_vm_events(item, zid, delta) \ diff --git a/include/math-emu/soft-fp.h b/include/math-emu/soft-fp.h index 5650c1628383..ded83c75db13 100644 --- a/include/math-emu/soft-fp.h +++ b/include/math-emu/soft-fp.h @@ -95,11 +95,11 @@ #endif #ifndef FP_INIT_ROUNDMODE -#define FP_INIT_ROUNDMODE do {} while (0) +#define FP_INIT_ROUNDMODE ((void)0) #endif #ifndef FP_HANDLE_EXCEPTIONS -#define FP_HANDLE_EXCEPTIONS do {} while (0) +#define FP_HANDLE_EXCEPTIONS ((void)0) #endif /* By default we never flush denormal input operands to signed zero. */ diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 1fb79c78e200..1b8681ffb8df 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -262,12 +262,12 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len, pp->debug_packet(af, pp, skb, ofs, msg); \ } while (0) #else /* NO DEBUGGING at ALL */ -#define IP_VS_DBG_BUF(level, msg...) do {} while (0) -#define IP_VS_ERR_BUF(msg...) do {} while (0) -#define IP_VS_DBG(level, msg...) do {} while (0) -#define IP_VS_DBG_RL(msg...) do {} while (0) -#define IP_VS_DBG_PKT(level, af, pp, skb, ofs, msg) do {} while (0) -#define IP_VS_DBG_RL_PKT(level, af, pp, skb, ofs, msg) do {} while (0) +#define IP_VS_DBG_BUF(level, msg...) ((void)0) +#define IP_VS_ERR_BUF(msg...) ((void)0) +#define IP_VS_DBG(level, msg...) ((void)0) +#define IP_VS_DBG_RL(msg...) ((void)0) +#define IP_VS_DBG_PKT(level, af, pp, skb, ofs, msg) ((void)0) +#define IP_VS_DBG_RL_PKT(level, af, pp, skb, ofs, msg) ((void)0) #endif #define IP_VS_BUG() BUG() @@ -293,8 +293,8 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len, __func__, __FILE__, __LINE__); \ } while (0) #else -#define EnterFunction(level) do {} while (0) -#define LeaveFunction(level) do {} while (0) +#define EnterFunction(level) ((void)0) +#define LeaveFunction(level) ((void)0) #endif /* The port number of FTP service (in network order). */ diff --git a/include/net/switchdev.h b/include/net/switchdev.h index d767b7991887..ee30529e9fac 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -237,7 +237,7 @@ static inline bool switchdev_port_same_parent_id(struct net_device *a, return false; } -#define SWITCHDEV_SET_OPS(netdev, ops) do {} while (0) +#define SWITCHDEV_SET_OPS(netdev, ops) ((void)0) #endif diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index 5d0bf1688eba..eae535c67f05 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -526,9 +526,9 @@ void snd_hdac_dsp_trigger(struct hdac_stream *azx_dev, bool start); void snd_hdac_dsp_cleanup(struct hdac_stream *azx_dev, struct snd_dma_buffer *dmab); #else /* CONFIG_SND_HDA_DSP_LOADER */ -#define snd_hdac_dsp_lock_init(dev) do {} while (0) -#define snd_hdac_dsp_lock(dev) do {} while (0) -#define snd_hdac_dsp_unlock(dev) do {} while (0) +#define snd_hdac_dsp_lock_init(dev) ((void)0) +#define snd_hdac_dsp_lock(dev) ((void)0) +#define snd_hdac_dsp_unlock(dev) ((void)0) #define snd_hdac_stream_is_locked(dev) 0 static inline int diff --git a/ipc/util.h b/ipc/util.h index 579112d90016..d5c7decd9ddd 100644 --- a/ipc/util.h +++ b/ipc/util.h @@ -85,7 +85,7 @@ int ipc_init_ids(struct ipc_ids *); void __init ipc_init_proc_interface(const char *path, const char *header, int ids, int (*show)(struct seq_file *, void *)); #else -#define ipc_init_proc_interface(path, header, ids, show) do {} while (0) +#define ipc_init_proc_interface(path, header, ids, show) ((void)0) #endif #define IPC_SEM_IDS 0 diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 15c814b8b8da..4832fe0d2fe1 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -963,15 +963,15 @@ static void __disarm_kprobe(struct kprobe *p, bool reopt) #else /* !CONFIG_OPTPROBES */ -#define optimize_kprobe(p) do {} while (0) -#define unoptimize_kprobe(p, f) do {} while (0) -#define kill_optimized_kprobe(p) do {} while (0) -#define prepare_optimized_kprobe(p) do {} while (0) -#define try_to_optimize_kprobe(p) do {} while (0) +#define optimize_kprobe(p) ((void)0) +#define unoptimize_kprobe(p, f) ((void)0) +#define kill_optimized_kprobe(p) ((void)0) +#define prepare_optimized_kprobe(p) ((void)0) +#define try_to_optimize_kprobe(p) ((void)0) #define __arm_kprobe(p) arch_arm_kprobe(p) #define __disarm_kprobe(p, o) arch_disarm_kprobe(p) #define kprobe_disarmed(p) kprobe_disabled(p) -#define wait_for_kprobe_optimizer() do {} while (0) +#define wait_for_kprobe_optimizer() ((void)0) static int reuse_unused_kprobe(struct kprobe *ap) { @@ -1044,8 +1044,8 @@ static void disarm_kprobe_ftrace(struct kprobe *p) } #else /* !CONFIG_KPROBES_ON_FTRACE */ #define prepare_kprobe(p) arch_prepare_kprobe(p) -#define arm_kprobe_ftrace(p) do {} while (0) -#define disarm_kprobe_ftrace(p) do {} while (0) +#define arm_kprobe_ftrace(p) ((void)0) +#define disarm_kprobe_ftrace(p) ((void)0) #endif /* Arm a kprobe with text_mutex */ diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 649926b0a90e..b4238fdd4512 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5471,7 +5471,7 @@ static inline void update_overutilized_status(struct rq *rq) } #else -#define update_overutilized_status(rq) do {} while (0) +#define update_overutilized_status(rq) ((void)0) #endif /* CONFIG_SMP */ diff --git a/lib/bch.c b/lib/bch.c index bc89dfe4d1b3..0855415bbe20 100644 --- a/lib/bch.c +++ b/lib/bch.c @@ -88,7 +88,7 @@ #define BCH_ECC_BYTES(_p) DIV_ROUND_UP(GF_M(_p)*GF_T(_p), 8) #ifndef dbg -#define dbg(_fmt, args...) do {} while (0) +#define dbg(_fmt, args...) ((void)0) #endif /* diff --git a/mm/shmem.c b/mm/shmem.c index 69eeb94730a8..5f605d28c309 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -4263,7 +4263,7 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range); #define shmem_file_operations ramfs_file_operations #define shmem_get_inode(sb, dir, mode, dev, flags) ramfs_get_inode(sb, dir, mode, dev) #define shmem_acct_size(flags, size) 0 -#define shmem_unacct_size(flags, size) do {} while (0) +#define shmem_unacct_size(flags, size) ((void)0) #endif /* CONFIG_SHMEM */ diff --git a/net/8021q/vlanproc.h b/net/8021q/vlanproc.h index 48cd4b4784e8..dbee1e874209 100644 --- a/net/8021q/vlanproc.h +++ b/net/8021q/vlanproc.h @@ -13,9 +13,9 @@ void vlan_proc_cleanup(struct net *net); #else /* No CONFIG_PROC_FS */ #define vlan_proc_init(net) (0) -#define vlan_proc_cleanup(net) do {} while (0) +#define vlan_proc_cleanup(net) ((void)0) #define vlan_proc_add_dev(dev) ({(void)(dev), 0; }) -#define vlan_proc_rem_dev(dev) do {} while (0) +#define vlan_proc_rem_dev(dev) ((void)0) #endif #endif /* !(__BEN_VLAN_PROC_INC__) */ diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index ebeae6acf747..9b854d60a891 100644 --- a/net/dccp/dccp.h +++ b/net/dccp/dccp.h @@ -44,9 +44,9 @@ extern bool dccp_debug; #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) #else -#define dccp_pr_debug(format, a...) do {} while (0) -#define dccp_pr_debug_cat(format, a...) do {} while (0) -#define dccp_debug(format, a...) do {} while (0) +#define dccp_pr_debug(format, a...) ((void)0) +#define dccp_pr_debug_cat(format, a...) ((void)0) +#define dccp_debug(format, a...) ((void)0) #endif extern struct inet_hashinfo dccp_hashinfo; diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index c236860c4ecb..5d8425d39f33 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -723,8 +723,8 @@ static void nf_bridge_adjust_segmented_data(struct sk_buff *skb) __skb_pull(skb, skb->network_header - skb->mac_header); } #else -#define nf_bridge_adjust_skb_data(s) do {} while (0) -#define nf_bridge_adjust_segmented_data(s) do {} while (0) +#define nf_bridge_adjust_skb_data(s) ((void)0) +#define nf_bridge_adjust_segmented_data(s) ((void)0) #endif static void free_entry(struct nf_queue_entry *entry) diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index 49c51e1c0bad..86b77c76b01e 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h @@ -22,7 +22,7 @@ BUG_ON(atomic_read((X)) >> (sizeof(atomic_t) - 2) == \ (POISON_FREE << 8 | POISON_FREE)) #else -#define CHECK_SLAB_OKAY(X) do {} while (0) +#define CHECK_SLAB_OKAY(X) ((void)0) #endif #define FCRYPT_BSIZE 8 diff --git a/samples/connector/ucon.c b/samples/connector/ucon.c index 8a4da64e02a8..faf3844d3e1b 100644 --- a/samples/connector/ucon.c +++ b/samples/connector/ucon.c @@ -51,7 +51,7 @@ #ifdef DEBUG #define ulog(f, a...) fprintf(stdout, f, ##a) #else -#define ulog(f, a...) do {} while (0) +#define ulog(f, a...) ((void)0) #endif static int need_exit; diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 25fdb7fda112..ce758e0ba834 100644 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -6066,7 +6066,7 @@ sub process { } } -# do {} while (0) macro tests: +# ((void)0) macro tests: # single-statement macros do not need to be enclosed in do while (0) loop, # macro should not end with a semicolon if ($perl_version_ok && @@ -6094,11 +6094,11 @@ sub process { if (($stmts =~ tr/;/;/) == 1 && $stmts !~ /^\s*(if|while|for|switch)\b/) { WARN("SINGLE_STATEMENT_DO_WHILE_MACRO", - "Single statement macros should not use a do {} while (0) loop\n" . "$herectx"); + "Single statement macros should not use a ((void)0) loop\n" . "$herectx"); } if (defined $semis && $semis ne "") { WARN("DO_WHILE_MACRO_WITH_TRAILING_SEMICOLON", - "do {} while (0) macros should not be semicolon terminated\n" . "$herectx"); + "((void)0) macros should not be semicolon terminated\n" . "$herectx"); } } elsif ($dstat =~ /^\+\s*#\s*define\s+$Ident.*;\s*$/) { $ctx =~ s/\n*$//; diff --git a/security/selinux/avc.c b/security/selinux/avc.c index 076346a35e22..af31e5588605 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c @@ -41,7 +41,7 @@ #ifdef CONFIG_SECURITY_SELINUX_AVC_STATS #define avc_cache_stats_incr(field) this_cpu_inc(avc_cache_stats.field) #else -#define avc_cache_stats_incr(field) do {} while (0) +#define avc_cache_stats_incr(field) ((void)0) #endif struct avc_entry { diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 1644a2d16998..acfa4f637f4b 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -929,7 +929,7 @@ static void snd_pcm_free_stream(struct snd_pcm_str * pstr) _notify->call(pcm); \ } while (0) #else -#define pcm_call_notify(pcm, call) do {} while (0) +#define pcm_call_notify(pcm, call) ((void)0) #endif static int snd_pcm_free(struct snd_pcm *pcm) diff --git a/sound/oss/sound_config.h b/sound/oss/sound_config.h index 5253b0a70437..3714d2f67a5d 100644 --- a/sound/oss/sound_config.h +++ b/sound/oss/sound_config.h @@ -125,7 +125,7 @@ static inline int translate_mode(struct file *file) #include "dev_table.h" #ifndef DDB -#define DDB(x) do {} while (0) +#define DDB(x) ((void)0) #endif #ifndef MDB diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c index 6a035ca0f521..7cec148c3b41 100644 --- a/sound/soc/au1x/dbdma2.c +++ b/sound/soc/au1x/dbdma2.c @@ -36,7 +36,7 @@ #ifdef PCM_DEBUG #define DBG MSG #else -#define DBG(x...) do {} while (0) +#define DBG(x...) ((void)0) #endif struct au1xpsc_audio_dmadata { diff --git a/sound/soc/codecs/dbgprint.h b/sound/soc/codecs/dbgprint.h index bcd3bda64523..1e5573d0fcf5 100644 --- a/sound/soc/codecs/dbgprint.h +++ b/sound/soc/codecs/dbgprint.h @@ -38,7 +38,7 @@ } while (0); # else -# define _DEBUG(level, fmt, va...) do {} while (0) +# define _DEBUG(level, fmt, va...) ((void)0) # endif # define MSG(fmt, va...) printk(KERN_INFO PREFIX "%s:%d: "fmt,\ @@ -79,7 +79,7 @@ # define _DEBUGMSG(level, fmt, ...) printf(PREFIX "%s:%d: "fmt,\ __FUNCTION__, __LINE__, __VA_ARGS__) # else -# define _DEBUGMSG(level, fmt, ...) do {} while (0) +# define _DEBUGMSG(level, fmt, ...) ((void)0) # endif # define _ERRORMSG(fmt, ...) printf(PREFIX "%s:%s:%d: "fmt, __FILE__,\ @@ -115,7 +115,7 @@ TB_FUNC, va)) //printf(PREFIX "%s:%d: "fmt,__func__,__LINE__,##va); # else -# define _DEBUG(level, fmt, va...) do {} while (0) +# define _DEBUG(level, fmt, va...) ((void)0) # endif # define MSG(fmt, ...) TB_TRACE_INF(TbTracePfx2("tfa", TB_FUNC, __VA_ARGS__)) @@ -151,7 +151,7 @@ # define _DEBUG(level, fmt, va...) printf(PREFIX "%s:%d: "fmt, __func__,\ __LINE__, ##va); # else -# define _DEBUG(level, fmt, va...) do {} while (0) +# define _DEBUG(level, fmt, va...) ((void)0) # endif # define MSG(fmt, va...) printf(PREFIX "%s:%s:%d: "fmt, __FILE__, __func__,\ diff --git a/techpack/audio/4.0/asoc/msm-qti-pp-config.h b/techpack/audio/4.0/asoc/msm-qti-pp-config.h index 01f0c8e215b3..dc9e1bdec98d 100644 --- a/techpack/audio/4.0/asoc/msm-qti-pp-config.h +++ b/techpack/audio/4.0/asoc/msm-qti-pp-config.h @@ -75,11 +75,11 @@ int msm_qti_pp_send_chmix_cfg_cmd(int port_id, int copp_idx, { return 0; } -#define msm_qti_pp_send_eq_values(fedai_id) do {} while (0) +#define msm_qti_pp_send_eq_values(fedai_id) ((void)0) #define msm_qti_pp_send_stereo_to_custom_stereo_cmd(port_id, copp_idx, \ session_id, op_FL_ip_FL_weight, op_FL_ip_FR_weight, \ op_FR_ip_FL_weight, op_FR_ip_FR_weight) (0) -#define msm_qti_pp_add_controls(platform) do {} while (0) +#define msm_qti_pp_add_controls(platform) ((void)0) #endif /* CONFIG_QTI_PP */ @@ -88,7 +88,7 @@ int msm_qti_pp_asphere_init(int port_id, int copp_idx); void msm_qti_pp_asphere_deinit(int port_id); #else #define msm_qti_pp_asphere_init(port_id, copp_idx) (0) -#define msm_qti_pp_asphere_deinit(port_id) do {} while (0) +#define msm_qti_pp_asphere_deinit(port_id) ((void)0) #endif #endif /* _MSM_QTI_PP_H_ */ diff --git a/techpack/audio/asoc/codecs/wcd934x/wcd934x-dsp-cntl.c b/techpack/audio/asoc/codecs/wcd934x/wcd934x-dsp-cntl.c index f18cc81a91f8..878e0148391b 100644 --- a/techpack/audio/asoc/codecs/wcd934x/wcd934x-dsp-cntl.c +++ b/techpack/audio/asoc/codecs/wcd934x/wcd934x-dsp-cntl.c @@ -163,7 +163,7 @@ static void wcd_cntl_collect_debug_dumps(struct wcd_dsp_cntl *cntl, } #else #define WCD_CNTL_SET_ERR_IRQ_FLAG(cntl) 0 -#define WCD_CNTL_CLR_ERR_IRQ_FLAG(cntl) do {} while (0) +#define WCD_CNTL_CLR_ERR_IRQ_FLAG(cntl) ((void)0) static void wcd_cntl_collect_debug_dumps(struct wcd_dsp_cntl *cntl, bool internal) { diff --git a/techpack/audio/asoc/msm-qti-pp-config.h b/techpack/audio/asoc/msm-qti-pp-config.h index edbd603487c8..eb28b7b64607 100644 --- a/techpack/audio/asoc/msm-qti-pp-config.h +++ b/techpack/audio/asoc/msm-qti-pp-config.h @@ -82,11 +82,11 @@ int msm_qti_pp_send_chmix_cfg_cmd(int port_id, int copp_idx, { return 0; } -#define msm_qti_pp_send_eq_values(fedai_id) do {} while (0) +#define msm_qti_pp_send_eq_values(fedai_id) ((void)0) #define msm_qti_pp_send_stereo_to_custom_stereo_cmd(port_id, copp_idx, \ session_id, op_FL_ip_FL_weight, op_FL_ip_FR_weight, \ op_FR_ip_FL_weight, op_FR_ip_FR_weight) (0) -#define msm_qti_pp_add_controls(platform) do {} while (0) +#define msm_qti_pp_add_controls(platform) ((void)0) #endif /* CONFIG_QTI_PP */ @@ -95,7 +95,7 @@ int msm_qti_pp_asphere_init(int port_id, int copp_idx); void msm_qti_pp_asphere_deinit(int port_id); #else #define msm_qti_pp_asphere_init(port_id, copp_idx) (0) -#define msm_qti_pp_asphere_deinit(port_id) do {} while (0) +#define msm_qti_pp_asphere_deinit(port_id) ((void)0) #endif #endif /* _MSM_QTI_PP_H_ */ diff --git a/tools/perf/util/probe-file.h b/tools/perf/util/probe-file.h index 63f29b1d22c1..de92d79c0ed7 100644 --- a/tools/perf/util/probe-file.h +++ b/tools/perf/util/probe-file.h @@ -74,6 +74,6 @@ static inline struct probe_cache *probe_cache__new(const char *tgt __maybe_unuse { return NULL; } -#define probe_cache__delete(pcache) do {} while (0) +#define probe_cache__delete(pcache) ((void)0) #endif #endif diff --git a/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h b/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h index be3fdd351937..9d0646978fc4 100644 --- a/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h +++ b/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h @@ -26,13 +26,13 @@ #ifndef NO_SYNC_SMP_MB #define sync_smp_mb() smp_mb() #else -#define sync_smp_mb() do {} while (0) +#define sync_smp_mb() ((void)0) #endif #ifndef NO_READ_SIDE_SMP_MB #define rs_smp_mb() smp_mb() #else -#define rs_smp_mb() do {} while (0) +#define rs_smp_mb() ((void)0) #endif #define ACCESS_ONCE(x) (*(volatile typeof(x) *) &(x)) diff --git a/tools/virtio/linux/kernel.h b/tools/virtio/linux/kernel.h index e4e35e66ea14..4456fd1df33f 100644 --- a/tools/virtio/linux/kernel.h +++ b/tools/virtio/linux/kernel.h @@ -118,7 +118,7 @@ static inline void free_page(unsigned long addr) #ifdef DEBUG #define pr_debug(format, ...) fprintf (stderr, format, ## __VA_ARGS__) #else -#define pr_debug(format, ...) do {} while (0) +#define pr_debug(format, ...) ((void)0) #endif #define dev_err(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__) #define dev_warn(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__) @@ -132,8 +132,8 @@ static inline void free_page(unsigned long addr) _min1 < _min2 ? _min1 : _min2; }) /* TODO: empty stubs for now. Broken but enough for virtio_ring.c */ -#define list_add_tail(a, b) do {} while (0) -#define list_del(a) do {} while (0) +#define list_add_tail(a, b) ((void)0) +#define list_del(a) ((void)0) #define list_for_each_entry(a, b, c) while (0) /* end of stubs */ diff --git a/tools/virtio/virtio-trace/trace-agent.h b/tools/virtio/virtio-trace/trace-agent.h index e67885969f0e..d1b05019349b 100644 --- a/tools/virtio/virtio-trace/trace-agent.h +++ b/tools/virtio/virtio-trace/trace-agent.h @@ -70,7 +70,7 @@ static inline void *zalloc(size_t size) #ifdef DEBUG #define pr_debug(format, ...) fprintf(stderr, format, ## __VA_ARGS__) #else -#define pr_debug(format, ...) do {} while (0) +#define pr_debug(format, ...) ((void)0) #endif #endif /*__TRACE_AGENT_H__*/ diff --git a/virt/kvm/async_pf.h b/virt/kvm/async_pf.h index ec4cfa278f04..c8bcd79a7a12 100644 --- a/virt/kvm/async_pf.h +++ b/virt/kvm/async_pf.h @@ -29,8 +29,8 @@ void kvm_async_pf_deinit(void); void kvm_async_pf_vcpu_init(struct kvm_vcpu *vcpu); #else #define kvm_async_pf_init() (0) -#define kvm_async_pf_deinit() do {} while (0) -#define kvm_async_pf_vcpu_init(C) do {} while (0) +#define kvm_async_pf_deinit() ((void)0) +#define kvm_async_pf_vcpu_init(C) ((void)0) #endif #endif