From: Tang Bin <tangbin@cmss.chinamobile.com> 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 <tangbin@cmss.chinamobile.com> Subject: [PATCH] bcm63xx_enet: simplify the code in bcm_enet_open() Date: Thu, 29 Jul 2021 15:06:27 +0800 [thread overview] Message-ID: <20210729070627.23776-1-tangbin@cmss.chinamobile.com> (raw) 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 <tangbin@cmss.chinamobile.com> --- 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; } -- 2.20.1.windows.1
WARNING: multiple messages have this Message-ID (diff)
From: Tang Bin <tangbin@cmss.chinamobile.com> 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 <tangbin@cmss.chinamobile.com> Subject: [PATCH] bcm63xx_enet: simplify the code in bcm_enet_open() Date: Thu, 29 Jul 2021 15:06:27 +0800 [thread overview] Message-ID: <20210729070627.23776-1-tangbin@cmss.chinamobile.com> (raw) 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 <tangbin@cmss.chinamobile.com> --- 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; } -- 2.20.1.windows.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2021-07-29 7:06 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-29 7:06 Tang Bin [this message] 2021-07-29 7:06 ` [PATCH] bcm63xx_enet: simplify the code in bcm_enet_open() Tang Bin 2021-07-29 21:23 ` Florian Fainelli 2021-07-29 21:23 ` Florian Fainelli 2021-07-30 13:28 ` Jakub Kicinski 2021-07-30 13:28 ` Jakub Kicinski
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210729070627.23776-1-tangbin@cmss.chinamobile.com \ --to=tangbin@cmss.chinamobile.com \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=davem@davemloft.net \ --cc=f.fainelli@gmail.com \ --cc=kuba@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=netdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.