Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp3831288pxu; Wed, 9 Dec 2020 01:28:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJxxqveqgC1OOF/XqYOLCYBhDeWwQNqgaCezhRT5Ig14YDZgccgFH5pFbpyuXVHBdEXwuBUm X-Received: by 2002:a17:907:444f:: with SMTP id on23mr1321760ejb.300.1607506102656; Wed, 09 Dec 2020 01:28:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607506102; cv=none; d=google.com; s=arc-20160816; b=nsN1kVCjkqzHZEU3tp5w7n771nBrOoGQ5jd/84SBkVFHCZ8Alz1tnOu5g19I0bkaZp 0uzliuW8YLSkr8IBM04EQ97lEAmaFWLEWDPIPXKmYcl4Du7qZcaqkMRMr1+WAWVaMvKB OAUPAHW7/+BI1vcDMpxAGcXY9E7MNs8Kh0078dSRSDZIUekLVpKDH8bYulVTlRYgmiOe pmgt3IDaF4/zw6QuLj1gx1PN3RyTunK9ZEkPLuuWKClelTiNIoeHa6tB72K88wdBSYmW pv0Zv87/jlHJwE03Pjk5bzzjxTA366kZSF7HAFpVQbFSsqdDSH0x8AJwWuZ0pvNUHpBh c2cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Oqck3bONA9siL5k2UkIqLh1aiYxk7VptA2gDzGac/Mk=; b=WuuBcCYq7dNO22Ex0UVdTTIwS2EgalL0tOoyeUlRHPSenXjyc5b21nm++yG1dubbPH xctYjUiaND8U0rn/IB/3p3qfoIfq7g7h9lxbR7nIpHi83CvXkHCUZVyy4dfUZ3LcMXKB XJiKrjKyE9WRr82w6HpvFhzA7+vgi+d24ahOkNYeKk9F4+A+Sy/FlanaaLXmsRpNx03c U/s1/53TIOXoJTSyE6f1Rt4hrBJ0wt/ShW69tGS8arod74iMkeJxlBQXA6B75W5ieHtm zHDP92l+tXne+tz9YueHolOzsVmH41qpT1AWvwVEgv6DoDUkN2yOp4X5QM2DdAs2sdqT /lEA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bf17si535381edb.344.2020.12.09.01.28.00; Wed, 09 Dec 2020 01:28:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729086AbgLIJXq (ORCPT + 99 others); Wed, 9 Dec 2020 04:23:46 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:9564 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727920AbgLIJXp (ORCPT ); Wed, 9 Dec 2020 04:23:45 -0500 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CrWly6DVqzM2cV; Wed, 9 Dec 2020 17:22:22 +0800 (CST) Received: from ubuntu.network (10.175.138.68) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.487.0; Wed, 9 Dec 2020 17:22:57 +0800 From: Zheng Yongjun To: , CC: , , , Zheng Yongjun Subject: [PATCH net-next] net: stmmac: simplify the return dwmac5_rxp_disable() Date: Wed, 9 Dec 2020 17:23:25 +0800 Message-ID: <20201209092325.20415-1-zhengyongjun3@huawei.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.138.68] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Simplify the return expression. Signed-off-by: Zheng Yongjun --- drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c index 67ba67ed0cb9..03e79a677c8b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c @@ -305,17 +305,13 @@ int dwmac5_safety_feat_dump(struct stmmac_safety_stats *stats, static int dwmac5_rxp_disable(void __iomem *ioaddr) { u32 val; - int ret; val = readl(ioaddr + MTL_OPERATION_MODE); val &= ~MTL_FRPE; writel(val, ioaddr + MTL_OPERATION_MODE); - ret = readl_poll_timeout(ioaddr + MTL_RXP_CONTROL_STATUS, val, + return readl_poll_timeout(ioaddr + MTL_RXP_CONTROL_STATUS, val, val & RXPI, 1, 10000); - if (ret) - return ret; - return 0; } static void dwmac5_rxp_enable(void __iomem *ioaddr) -- 2.22.0