From patchwork Thu Jul 29 07:06:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tang Bin X-Patchwork-Id: 12407851 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EAB3CC4338F for ; Thu, 29 Jul 2021 07:08:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B68D261059 for ; Thu, 29 Jul 2021 07:08:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B68D261059 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=cmss.chinamobile.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=MKzfDZmxasIDMnOeAvGeIvPG3bnc0/mOb1k7XHPNdEY=; b=p7jFjcihjGAV91 e5+cuHUx4cRWf6G3sot0FwiNOhW5i0sGy82lI2kuCB0GZxo4DxAx81QNEhfxeLXx/4PUr5N39f3bK zn9oNFqwMycxxXxojgdHO4Pb7ScrgaRh5sZ3QdpzY0qTi4Evw9AK5jqk0RtjczEn18XdZ+GdMVmvf sb/vnW8koxxHaQKPoK86DOqw46I2vMrIqVlg82z+8QPueTow6ltYVbFhd45n/EnKgroyUSNj7Yfmq lp+12nnLCy8cwtMzy3g5+z2SGSixI6eGHAjTLfeYz1FmXZfUp5LaVUnqhJ5vIFl/7UqedGSbNlv0v m8AUz0tC7teJrJW5SD7w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m907v-003K1E-Ux; Thu, 29 Jul 2021 07:06:44 +0000 Received: from cmccmta2.chinamobile.com ([221.176.66.80]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m907o-003JwL-OD for linux-arm-kernel@lists.infradead.org; Thu, 29 Jul 2021 07:06:41 +0000 Received: from spf.mail.chinamobile.com (unknown[172.16.121.5]) by rmmx-syy-dmz-app05-12005 (RichMail) with SMTP id 2ee56102533d75e-b20fc; Thu, 29 Jul 2021 15:05:34 +0800 (CST) X-RM-TRANSID: 2ee56102533d75e-b20fc X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 Received: from localhost.localdomain (unknown[223.112.105.130]) by rmsmtp-syy-appsvr03-12003 (RichMail) with SMTP id 2ee36102533b098-b11b7; Thu, 29 Jul 2021 15:05:34 +0800 (CST) X-RM-TRANSID: 2ee36102533b098-b11b7 From: Tang Bin To: davem@davemloft.net, kuba@kernel.org, f.fainelli@gmail.com, bcm-kernel-feedback-list@broadcom.com Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Tang Bin Subject: [PATCH] bcm63xx_enet: simplify the code in bcm_enet_open() Date: Thu, 29 Jul 2021 15:06:27 +0800 Message-Id: <20210729070627.23776-1-tangbin@cmss.chinamobile.com> X-Mailer: git-send-email 2.20.1.windows.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210729_000637_609202_13DE361E X-CRM114-Status: UNSURE ( 9.03 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In the function bcm_enet_open(), 'ret = -ENOMEM' can be moved outside the judgement statement, so redundant assignments can be removed to simplify the code. Signed-off-by: Tang Bin Acked-by: Florian Fainelli --- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 509e10013..c5a3c5774 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -920,13 +920,13 @@ static int bcm_enet_open(struct net_device *dev) memcpy(addr.sa_data, dev->dev_addr, ETH_ALEN); bcm_enet_set_mac_address(dev, &addr); + ret = -ENOMEM; + /* allocate rx dma ring */ size = priv->rx_ring_size * sizeof(struct bcm_enet_desc); p = dma_alloc_coherent(kdev, size, &priv->rx_desc_dma, GFP_KERNEL); - if (!p) { - ret = -ENOMEM; + if (!p) goto out_freeirq_tx; - } priv->rx_desc_alloc_size = size; priv->rx_desc_cpu = p; @@ -934,20 +934,16 @@ static int bcm_enet_open(struct net_device *dev) /* allocate tx dma ring */ size = priv->tx_ring_size * sizeof(struct bcm_enet_desc); p = dma_alloc_coherent(kdev, size, &priv->tx_desc_dma, GFP_KERNEL); - if (!p) { - ret = -ENOMEM; + if (!p) goto out_free_rx_ring; - } priv->tx_desc_alloc_size = size; priv->tx_desc_cpu = p; priv->tx_skb = kcalloc(priv->tx_ring_size, sizeof(struct sk_buff *), GFP_KERNEL); - if (!priv->tx_skb) { - ret = -ENOMEM; + if (!priv->tx_skb) goto out_free_tx_ring; - } priv->tx_desc_count = priv->tx_ring_size; priv->tx_dirty_desc = 0; @@ -957,10 +953,8 @@ static int bcm_enet_open(struct net_device *dev) /* init & fill rx ring with skbs */ priv->rx_skb = kcalloc(priv->rx_ring_size, sizeof(struct sk_buff *), GFP_KERNEL); - if (!priv->rx_skb) { - ret = -ENOMEM; + if (!priv->rx_skb) goto out_free_tx_skb; - } priv->rx_desc_count = 0; priv->rx_dirty_desc = 0; @@ -976,7 +970,6 @@ static int bcm_enet_open(struct net_device *dev) if (bcm_enet_refill_rx(dev)) { dev_err(kdev, "cannot allocate rx skb queue\n"); - ret = -ENOMEM; goto out; }