From 98394cf69712d4b03eedbe11208a3d64364d2469 Mon Sep 17 00:00:00 2001 From: Qinglang Miao Date: Mon, 21 Sep 2020 21:10:26 +0800 Subject: [PATCH] enetc: simplify the return expression of enetc_vf_set_mac_addr() [ Upstream commit d4b717dd2009f9003a5b4844a0e0ae0370d4c506 ] Simplify the return expression. Signed-off-by: Qinglang Miao Reviewed-by: Claudiu Manoil Signed-off-by: David S. Miller Stable-dep-of: badccd49b93b ("net: enetc: set MAC address to the VF net_device") Signed-off-by: Sasha Levin --- drivers/net/ethernet/freescale/enetc/enetc_vf.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc_vf.c b/drivers/net/ethernet/freescale/enetc/enetc_vf.c index 3a8c2049b417..af287b6d5f3b 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_vf.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_vf.c @@ -85,16 +85,11 @@ static int enetc_vf_set_mac_addr(struct net_device *ndev, void *addr) { struct enetc_ndev_priv *priv = netdev_priv(ndev); struct sockaddr *saddr = addr; - int err; if (!is_valid_ether_addr(saddr->sa_data)) return -EADDRNOTAVAIL; - err = enetc_msg_vsi_set_primary_mac_addr(priv, saddr); - if (err) - return err; - - return 0; + return enetc_msg_vsi_set_primary_mac_addr(priv, saddr); } static int enetc_vf_set_features(struct net_device *ndev,