[PATCH] xilinx: Change logic around zynq_board_read_rom_ethaddr()

[Michal Simek]

st 5. 8. 2020 v 14:02 odesílatel Michal Simek <michal.simek at xilinx.com> napsal:
>
> There is no reason to build private function when
> CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET is not defined. There is already weak
> function which handles default case properly.
>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
>
>  board/xilinx/common/board.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
> index 3bca3a25a97b..0782d08ee3fe 100644
> --- a/board/xilinx/common/board.c
> +++ b/board/xilinx/common/board.c
> @@ -13,11 +13,10 @@
>  #include <linux/sizes.h>
>  #include "board.h"
>
> +#if defined(CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET)
>  int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)
>  {
>         int ret = -EINVAL;
> -
> -#if defined(CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET)
>         struct udevice *dev;
>         ofnode eeprom;
>
> @@ -37,10 +36,10 @@ int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)
>                 debug("%s: I2C EEPROM MAC address read failed\n", __func__);
>         else
>                 debug("%s: I2C EEPROM MAC %pM\n", __func__, ethaddr);
> -#endif
>
>         return ret;
>  }
> +#endif
>
>  #if defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE)
>  void *board_fdt_blob_setup(void)
> --
> 2.27.0
>

Applied.
M

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs