Commit c48977f0 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Alex Deucher
Browse files

drm/amd/display: fix empty debug macros 



Using an empty macro expansion as a conditional expression
produces a W=1 warning:

drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_aux.c: In function 'dce_aux_transfer_with_retries':
drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_aux.c:775:156: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
  775 |                                                                 "dce_aux_transfer_with_retries: AUX_RET_SUCCESS: AUX_TRANSACTION_REPLY_I2C_OVER_AUX_DEFER");
      |                                                                                                                                                            ^
drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_aux.c:783:155: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
  783 |                                                                 "dce_aux_transfer_with_retries: AUX_RET_SUCCESS: AUX_TRANSACTION_REPLY_I2C_OVER_AUX_NACK");
      |                                                                                                                                                           ^

Expand it to "do { } while (0)" instead to make the expression
more robust and avoid the warning.

Fixes: 56aca230 ("drm/amd/display: Add AUX I2C tracing.")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e4e737bb

drivers/gpu/drm/amd/display/dc/dce/dce_aux.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#define DC_LOGGER \

	engine->ctx->logger



#define DC_TRACE_LEVEL_MESSAGE(...) /* do nothing */

#define DC_TRACE_LEVEL_MESSAGE(...) do { } while (0)

#define IS_DC_I2CAUX_LOGGING_ENABLED() (false)

#define LOG_FLAG_Error_I2cAux LOG_ERROR

#define LOG_FLAG_I2cAux_DceAux LOG_I2C_AUX
@@ -76,7 +76,7 @@ enum { 
#define DEFAULT_AUX_ENGINE_MULT   0

#define DEFAULT_AUX_ENGINE_LENGTH 69



#define DC_TRACE_LEVEL_MESSAGE(...) /* do nothing */

#define DC_TRACE_LEVEL_MESSAGE(...) do { } while (0)



static void release_engine(

	struct dce_aux *engine)