From patchwork Sat Jun 28 00:10:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 365245 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5188F1400B5 for ; Sat, 28 Jun 2014 10:09:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754615AbaF1AJq (ORCPT ); Fri, 27 Jun 2014 20:09:46 -0400 Received: from mail-lb0-f170.google.com ([209.85.217.170]:49368 "EHLO mail-lb0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753843AbaF1AJo (ORCPT ); Fri, 27 Jun 2014 20:09:44 -0400 Received: by mail-lb0-f170.google.com with SMTP id 10so4505904lbg.1 for ; Fri, 27 Jun 2014 17:09:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:subject:cc:from:organization:date :mime-version:content-type:content-transfer-encoding:message-id; bh=hDpfRDbUPC6ZM/APxbRMlWEOSTiz20yJ44UbEUBJEC4=; b=lZu0XtJyQPwgwMavhLdG3xUzFN+qm5wDPS1HfmYTeQe/mu1cBfFOuCkqP/h/Hwf9Ex UvJeCGBvF00WNRfx8jU67m/9ftdoo8KT9I1DRWf28x19ofDUOl1KricZK0bSVGUJqENG JumJgrHnjM9+rqm9z+XmE1OyI3gVjT93xQcHE5Te+l28BbGUG3S2/kAiVXGCH8m/8ir9 rQ2VW398eEbFs9vsXGnJKu0klXdqIbqpTsyCIlRYAcdzmVQNxlTlKPjJ2TJe4tNYZpME 61r/egz/wNwa+tNrRvvnU+0qVZpLRkfldAVk4kB0A8ZFMs7A0jd7sB7ru9Qqc1FT4gLS 4CcQ== X-Gm-Message-State: ALoCoQk+A8GfWgV/5VdcSBlGS+6AZObuQIttTbWbmy7FLxit1dSIQ2cf4Xhq4cDOZ3YaYjZsLqSC X-Received: by 10.152.115.134 with SMTP id jo6mr18551449lab.6.1403914183404; Fri, 27 Jun 2014 17:09:43 -0700 (PDT) Received: from wasted.cogentembedded.com (ppp21-42.pppoe.mtu-net.ru. [81.195.21.42]) by mx.google.com with ESMTPSA id oq10sm8237394lbb.12.2014.06.27.17.09.42 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 27 Jun 2014 17:09:42 -0700 (PDT) To: netdev@vger.kernel.org Subject: [PATCH] sh_eth: remove checks around dev_kfree_skb() calls Cc: linux-sh@vger.kernel.org From: Sergei Shtylyov Organization: Cogent Embedded Date: Sat, 28 Jun 2014 04:10:00 +0400 MIME-Version: 1.0 Message-Id: <201406280410.01146.sergei.shtylyov@cogentembedded.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since consume_skb() (and hence dev_kfree_skb() macro) checks the passed pointer for NULL, there's no need to check for NULL before invoking dev_kfree_skb(). Signed-off-by: Sergei Shtylyov --- The patch is against Dave Miller's 'net-next.git' repo. drivers/net/ethernet/renesas/sh_eth.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: net-next/drivers/net/ethernet/renesas/sh_eth.c =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -1094,20 +1094,16 @@ static void sh_eth_ring_free(struct net_ /* Free Rx skb ringbuffer */ if (mdp->rx_skbuff) { - for (i = 0; i < mdp->num_rx_ring; i++) { - if (mdp->rx_skbuff[i]) - dev_kfree_skb(mdp->rx_skbuff[i]); - } + for (i = 0; i < mdp->num_rx_ring; i++) + dev_kfree_skb(mdp->rx_skbuff[i]); } kfree(mdp->rx_skbuff); mdp->rx_skbuff = NULL; /* Free Tx skb ringbuffer */ if (mdp->tx_skbuff) { - for (i = 0; i < mdp->num_tx_ring; i++) { - if (mdp->tx_skbuff[i]) - dev_kfree_skb(mdp->tx_skbuff[i]); - } + for (i = 0; i < mdp->num_tx_ring; i++) + dev_kfree_skb(mdp->tx_skbuff[i]); } kfree(mdp->tx_skbuff); mdp->tx_skbuff = NULL; @@ -2077,13 +2073,11 @@ static void sh_eth_tx_timeout(struct net rxdesc = &mdp->rx_ring[i]; rxdesc->status = 0; rxdesc->addr = 0xBADF00D0; - if (mdp->rx_skbuff[i]) - dev_kfree_skb(mdp->rx_skbuff[i]); + dev_kfree_skb(mdp->rx_skbuff[i]); mdp->rx_skbuff[i] = NULL; } for (i = 0; i < mdp->num_tx_ring; i++) { - if (mdp->tx_skbuff[i]) - dev_kfree_skb(mdp->tx_skbuff[i]); + dev_kfree_skb(mdp->tx_skbuff[i]); mdp->tx_skbuff[i] = NULL; }