Commit 8e6a8285 authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Martin Schwidefsky
Browse files

s390/s390dbf: use debug_level_enabled() where applicable 



Refactor direct debug level comparisons with the (internal) s390db->level
member.  Use the debug_level_enabled() function instead.

Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent f1d86b61

drivers/s390/block/scm_blk.h

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ extern debug_info_t *scm_debug; 


static inline void SCM_LOG_HEX(int level, void *data, int length)

{

	if (level > scm_debug->level)

	if (!debug_level_enabled(scm_debug, level))

		return;

	while (length > 0) {

		debug_event(scm_debug, level, data, length);

drivers/s390/cio/eadm_sch.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static debug_info_t *eadm_debug; 


static void EADM_LOG_HEX(int level, void *data, int length)

{

	if (level > eadm_debug->level)

	if (!debug_level_enabled(eadm_debug, level))

		return;

	while (length > 0) {

		debug_event(eadm_debug, level, data, length);

drivers/s390/cio/qdio_debug.h

+1 −7
Original line number Diff line number Diff line
@@ -16,12 +16,6 @@ 
extern debug_info_t *qdio_dbf_setup;

extern debug_info_t *qdio_dbf_error;



/* sort out low debug levels early to avoid wasted sprints */

static inline int qdio_dbf_passes(debug_info_t *dbf_grp, int level)

{

	return (level <= dbf_grp->level);

}



#define DBF_ERR		3	/* error conditions	*/

#define DBF_WARN	4	/* warning conditions	*/

#define DBF_INFO	6	/* informational	*/
@@ -65,7 +59,7 @@ static inline void DBF_ERROR_HEX(void *addr, int len) 
#define DBF_DEV_EVENT(level, device, text...) \

	do { \

		char debug_buffer[QDIO_DBF_LEN]; \

		if (qdio_dbf_passes(device->debug_area, level)) { \

		if (debug_level_enabled(device->debug_area, level)) { \

			snprintf(debug_buffer, QDIO_DBF_LEN, text); \

			debug_text_event(device->debug_area, level, debug_buffer); \

		} \

drivers/s390/crypto/zcrypt_debug.h

+3 −9
Original line number Diff line number Diff line
@@ -11,12 +11,6 @@ 
/* that gives us 15 characters in the text event views */

#define ZCRYPT_DBF_LEN	16



/* sort out low debug levels early to avoid wasted sprints */

static inline int zcrypt_dbf_passes(debug_info_t *dbf_grp, int level)

{

	return (level <= dbf_grp->level);

}



#define DBF_ERR		3	/* error conditions	*/

#define DBF_WARN	4	/* warning conditions	*/

#define DBF_INFO	6	/* informational	*/
@@ -25,7 +19,7 @@ static inline int zcrypt_dbf_passes(debug_info_t *dbf_grp, int level) 


#define ZCRYPT_DBF_COMMON(level, text...) \

	do { \

		if (zcrypt_dbf_passes(zcrypt_dbf_common, level)) { \

		if (debug_level_enabled(zcrypt_dbf_common, level)) { \

			char debug_buffer[ZCRYPT_DBF_LEN]; \

			snprintf(debug_buffer, ZCRYPT_DBF_LEN, text); \

			debug_text_event(zcrypt_dbf_common, level, \
@@ -35,7 +29,7 @@ static inline int zcrypt_dbf_passes(debug_info_t *dbf_grp, int level) 


#define ZCRYPT_DBF_DEVICES(level, text...) \

	do { \

		if (zcrypt_dbf_passes(zcrypt_dbf_devices, level)) { \

		if (debug_level_enabled(zcrypt_dbf_devices, level)) { \

			char debug_buffer[ZCRYPT_DBF_LEN]; \

			snprintf(debug_buffer, ZCRYPT_DBF_LEN, text); \

			debug_text_event(zcrypt_dbf_devices, level, \
@@ -45,7 +39,7 @@ static inline int zcrypt_dbf_passes(debug_info_t *dbf_grp, int level) 


#define ZCRYPT_DBF_DEV(level, device, text...) \

	do { \

		if (zcrypt_dbf_passes(device->dbf_area, level)) { \

		if (debug_level_enabled(device->dbf_area, level)) { \

			char debug_buffer[ZCRYPT_DBF_LEN]; \

			snprintf(debug_buffer, ZCRYPT_DBF_LEN, text); \

			debug_text_event(device->dbf_area, level, \

drivers/s390/net/claw.h

+1 −7
Original line number Diff line number Diff line
@@ -114,15 +114,9 @@ do { \ 
	debug_event(claw_dbf_##name,level,(void*)(addr),len); \

} while (0)



/* Allow to sort out low debug levels early to avoid wasted sprints */

static inline int claw_dbf_passes(debug_info_t *dbf_grp, int level)

{

	return (level <= dbf_grp->level);

}



#define CLAW_DBF_TEXT_(level,name,text...) \

	do { \

		if (claw_dbf_passes(claw_dbf_##name, level)) { \

		if (debug_level_enabled(claw_dbf_##name, level)) { \

			sprintf(debug_buffer, text); \

			debug_text_event(claw_dbf_##name, level, \

						debug_buffer); \