5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qinglang Miao miaoqinglang@huawei.com
[ Upstream commit d4b717dd2009f9003a5b4844a0e0ae0370d4c506 ]
Simplify the return expression.
Signed-off-by: Qinglang Miao miaoqinglang@huawei.com Reviewed-by: Claudiu Manoil claudiu.manoil@nxp.com Signed-off-by: David S. Miller davem@davemloft.net Stable-dep-of: badccd49b93b ("net: enetc: set MAC address to the VF net_device") Signed-off-by: Sasha Levin sashal@kernel.org --- 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 3a8c2049b417c..af287b6d5f3b7 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,