From: Olliver Schinagl Date: Mon, 3 Apr 2017 14:18:53 +0000 (+0200) Subject: net: zynq_gem: Do not return -ENOSYS on success X-Git-Tag: v2017.07-rc1~87^2~13 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b233089787601d63e44d8d3ddb7d2731ef53cf4e;p=oweals%2Fu-boot.git net: zynq_gem: Do not return -ENOSYS on success The .read_rom_hwaddr net_ops hook does not check the return value, which is why it was never caught that we are currently returning 0 if the read_rom_hwaddr function return -ENOSYS and -ENOSYS otherwise. In this case we can simplify this by just returning the result of the function. Signed-off-by: Olliver Schinagl Acked-by: Joe Hershberger Acked-by: Michal Simek --- diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 1bb7fa576f..f3d6727a9d 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -587,14 +587,12 @@ __weak int zynq_board_read_rom_ethaddr(unsigned char *ethaddr) static int zynq_gem_read_rom_mac(struct udevice *dev) { - int retval; struct eth_pdata *pdata = dev_get_platdata(dev); - retval = zynq_board_read_rom_ethaddr(pdata->enetaddr); - if (retval == -ENOSYS) - retval = 0; + if (!pdata) + return -ENOSYS; - return retval; + return zynq_board_read_rom_ethaddr(pdata->enetaddr); } static int zynq_gem_miiphy_read(struct mii_dev *bus, int addr,