Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39b083fe authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] empty function defines. 



Use do { } while (0) constructs instead of empty defines to avoid
subtle compile bugs.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent ff6b8ea6

drivers/s390/cio/qdio.h

+8 −8
Original line number Diff line number Diff line
@@ -191,49 +191,49 @@ enum qdio_irq_states { 
#if QDIO_VERBOSE_LEVEL>8

#define QDIO_PRINT_STUPID(x...) printk( KERN_DEBUG QDIO_PRINTK_HEADER x)

#else

#define QDIO_PRINT_STUPID(x...)

#define QDIO_PRINT_STUPID(x...) do { } while (0)

#endif



#if QDIO_VERBOSE_LEVEL>7

#define QDIO_PRINT_ALL(x...) printk( QDIO_PRINTK_HEADER x)

#else

#define QDIO_PRINT_ALL(x...)

#define QDIO_PRINT_ALL(x...) do { } while (0)

#endif



#if QDIO_VERBOSE_LEVEL>6

#define QDIO_PRINT_INFO(x...) printk( QDIO_PRINTK_HEADER x)

#else

#define QDIO_PRINT_INFO(x...)

#define QDIO_PRINT_INFO(x...) do { } while (0)

#endif



#if QDIO_VERBOSE_LEVEL>5

#define QDIO_PRINT_WARN(x...) printk( QDIO_PRINTK_HEADER x)

#else

#define QDIO_PRINT_WARN(x...)

#define QDIO_PRINT_WARN(x...) do { } while (0)

#endif



#if QDIO_VERBOSE_LEVEL>4

#define QDIO_PRINT_ERR(x...) printk( QDIO_PRINTK_HEADER x)

#else

#define QDIO_PRINT_ERR(x...)

#define QDIO_PRINT_ERR(x...) do { } while (0)

#endif



#if QDIO_VERBOSE_LEVEL>3

#define QDIO_PRINT_CRIT(x...) printk( QDIO_PRINTK_HEADER x)

#else

#define QDIO_PRINT_CRIT(x...)

#define QDIO_PRINT_CRIT(x...) do { } while (0)

#endif



#if QDIO_VERBOSE_LEVEL>2

#define QDIO_PRINT_ALERT(x...) printk( QDIO_PRINTK_HEADER x)

#else

#define QDIO_PRINT_ALERT(x...)

#define QDIO_PRINT_ALERT(x...) do { } while (0)

#endif



#if QDIO_VERBOSE_LEVEL>1

#define QDIO_PRINT_EMERG(x...) printk( QDIO_PRINTK_HEADER x)

#else

#define QDIO_PRINT_EMERG(x...)

#define QDIO_PRINT_EMERG(x...) do { } while (0)

#endif



#define HEXDUMP16(importance,header,ptr) \

drivers/s390/scsi/zfcp_def.h

+4 −4
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ do { \ 
} while (0)

	

#if ZFCP_LOG_LEVEL_LIMIT < ZFCP_LOG_LEVEL_NORMAL

# define ZFCP_LOG_NORMAL(fmt, args...)

# define ZFCP_LOG_NORMAL(fmt, args...)	do { } while (0)

#else

# define ZFCP_LOG_NORMAL(fmt, args...) \

do { \
@@ -553,7 +553,7 @@ do { \ 
#endif



#if ZFCP_LOG_LEVEL_LIMIT < ZFCP_LOG_LEVEL_INFO

# define ZFCP_LOG_INFO(fmt, args...)

# define ZFCP_LOG_INFO(fmt, args...)	do { } while (0)

#else

# define ZFCP_LOG_INFO(fmt, args...) \

do { \
@@ -563,14 +563,14 @@ do { \ 
#endif



#if ZFCP_LOG_LEVEL_LIMIT < ZFCP_LOG_LEVEL_DEBUG

# define ZFCP_LOG_DEBUG(fmt, args...)

# define ZFCP_LOG_DEBUG(fmt, args...)	do { } while (0)

#else

# define ZFCP_LOG_DEBUG(fmt, args...) \

	ZFCP_LOG(ZFCP_LOG_LEVEL_DEBUG, fmt , ##args)

#endif



#if ZFCP_LOG_LEVEL_LIMIT < ZFCP_LOG_LEVEL_TRACE

# define ZFCP_LOG_TRACE(fmt, args...)

# define ZFCP_LOG_TRACE(fmt, args...)	do { } while (0)

#else

# define ZFCP_LOG_TRACE(fmt, args...) \

	ZFCP_LOG(ZFCP_LOG_LEVEL_TRACE, fmt , ##args)

include/asm-s390/dma.h

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,6 @@ 


#define MAX_DMA_ADDRESS         0x80000000



#define free_dma(x)

#define free_dma(x)	do { } while (0)



#endif /* _ASM_DMA_H */

include/asm-s390/io.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ extern void iounmap(void *addr); 
#define outb(x,addr) ((void) writeb(x,addr))

#define outb_p(x,addr) outb(x,addr)



#define mmiowb()

#define mmiowb()	do { } while (0)



/*

 * Convert a physical pointer to a virtual kernel pointer for /dev/mem

include/asm-s390/smp.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ smp_call_function_on(void (*func) (void *info), void *info, 
#define smp_cpu_not_running(cpu)	1

#define smp_get_cpu(cpu) ({ 0; })

#define smp_put_cpu(cpu) ({ 0; })

#define smp_setup_cpu_possible_map()

#define smp_setup_cpu_possible_map()	do { } while (0)

#endif



#endif