From a26ae29559d3456f8d92f705c5c798c39e0bc683 Mon Sep 17 00:00:00 2001 From: Francesco Dolcini Date: Thu, 21 Jul 2022 15:17:36 +0200 Subject: toradex: common: Remove #ifdef usage for 2nd ethaddr Fix checkpatch warn, use `IS_ENABLED(CONFIG_TDX_CFG_BLOCK_2ND_ETHADDR)` instead of `#ifdef CONFIG_TDX_CFG_BLOCK_2ND_ETHADDR`. Upstream-Status: Backport [9762fbeea451f4d81ec88788e7680e37a1ee5beb] Signed-off-by: Francesco Dolcini --- board/toradex/common/tdx-common.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index bd42924058..290de8add8 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -151,8 +151,8 @@ int show_board_info(void) if (!eth_env_get_enetaddr("ethaddr", ethaddr)) eth_env_set_enetaddr("ethaddr", (u8 *)&tdx_eth_addr); -#ifdef CONFIG_TDX_CFG_BLOCK_2ND_ETHADDR - if (!eth_env_get_enetaddr("eth1addr", ethaddr)) { + if (IS_ENABLED(CONFIG_TDX_CFG_BLOCK_2ND_ETHADDR) && + !eth_env_get_enetaddr("eth1addr", ethaddr)) { /* * Secondary MAC address is allocated from block * 0x100000 higher then the first MAC address @@ -161,7 +161,6 @@ int show_board_info(void) ethaddr[3] += 0x10; eth_env_set_enetaddr("eth1addr", ethaddr); } -#endif return 0; } -- cgit v1.2.3