From patchwork Thu Jul 10 05:35:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varka Bhadram X-Patchwork-Id: 368466 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 239F4140127 for ; Thu, 10 Jul 2014 15:37:28 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751441AbaGJFhV (ORCPT ); Thu, 10 Jul 2014 01:37:21 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:49698 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751409AbaGJFhT (ORCPT ); Thu, 10 Jul 2014 01:37:19 -0400 Received: by mail-pa0-f50.google.com with SMTP id bj1so10493024pad.37 for ; Wed, 09 Jul 2014 22:37:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aAui84vXUD3/QyCHf7Tjty/GSg+jQC/ckUipGaThSyg=; b=W+/q46P1W1zbF+1HCIzxPJbBrCG+X8dEaFKILzgPolzG2Sog+n1FfHduL4Ek2G06WB V8WgPUb0Sf/Q9fUyQGzRHxOCYWvj4yM/058RVxTstubaGWov389NlNfxwzRaw/0597mF 4sEGE+pU9BxEsH/mmk4QA8z5yrBImm8qWTry0zhU0HtMmSk272HMhhhbdDENurxYbz33 n1cHv4t4YLTJJOd3psaAu2AQ3C5m+LPqsUUBKeFTHT+AkRvZjSEXkIWk5pzzZyEkdLRV NLbfrLHsI/DmI5el7xlhCHKpO8udYppsFJqXeV8G5/FTOPe7WhJnn0BNmKmsetKq5i/v oGJQ== X-Received: by 10.68.132.42 with SMTP id or10mr45179079pbb.80.1404970638812; Wed, 09 Jul 2014 22:37:18 -0700 (PDT) Received: from cdac.hyderabad.cdac.in ([196.12.45.164]) by mx.google.com with ESMTPSA id su8sm60621023pbc.72.2014.07.09.22.37.15 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Jul 2014 22:37:18 -0700 (PDT) From: varkabhadram@gmail.com To: netdev@vger.kernel.org Cc: mugunthanvnm@ti.com, linux@rainbow-software.org, balbi@ti.com, george.cherian@ti.com, davem@davemloft.net, Varka Bhadram Subject: [PATCH net v2 5/7] net: cpmac: fix missing a blank line after declarations Date: Thu, 10 Jul 2014 11:05:43 +0530 Message-Id: <1404970545-26508-6-git-send-email-varkabhadram@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1404970545-26508-1-git-send-email-varkabhadram@gmail.com> References: <1404970545-26508-1-git-send-email-varkabhadram@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Varka Bhadram This patch insert a blank line after declaration Signed-off-by: Varka Bhadram Reviewed-by: Felipe Balbi --- drivers/net/ethernet/ti/cpmac.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c index 1520c19..3d3ead4 100644 --- a/drivers/net/ethernet/ti/cpmac.c +++ b/drivers/net/ethernet/ti/cpmac.c @@ -224,6 +224,7 @@ static void cpmac_dump_regs(struct net_device *dev) { int i; struct cpmac_priv *priv = netdev_priv(dev); + for (i = 0; i < CPMAC_REG_END; i += 4) { if (i % 16 == 0) { if (i) @@ -238,6 +239,7 @@ static void cpmac_dump_regs(struct net_device *dev) static void cpmac_dump_desc(struct net_device *dev, struct cpmac_desc *desc) { int i; + netdev_dbg(dev, "desc[%p]:", desc); for (i = 0; i < sizeof(*desc) / 4; i++) pr_debug(" %08x", ((u32 *)desc)[i]); @@ -248,6 +250,7 @@ static void cpmac_dump_all_desc(struct net_device *dev) { struct cpmac_priv *priv = netdev_priv(dev); struct cpmac_desc *dump = priv->rx_head; + do { cpmac_dump_desc(dev, dump); dump = dump->next; @@ -257,6 +260,7 @@ static void cpmac_dump_all_desc(struct net_device *dev) static void cpmac_dump_skb(struct net_device *dev, struct sk_buff *skb) { int i; + netdev_dbg(dev, "skb 0x%p, len=%d\n", skb, skb->len); for (i = 0; i < skb->len; i++) { if (i % 16 == 0) { @@ -681,6 +685,7 @@ static void cpmac_clear_rx(struct net_device *dev) struct cpmac_priv *priv = netdev_priv(dev); struct cpmac_desc *desc; int i; + if (unlikely(!priv->rx_head)) return; desc = priv->rx_head; @@ -703,6 +708,7 @@ static void cpmac_clear_tx(struct net_device *dev) { struct cpmac_priv *priv = netdev_priv(dev); int i; + if (unlikely(!priv->desc_ring)) return; for (i = 0; i < CPMAC_QUEUES; i++) { @@ -821,6 +827,7 @@ static void cpmac_tx_timeout(struct net_device *dev) static int cpmac_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) { struct cpmac_priv *priv = netdev_priv(dev); + if (!(netif_running(dev))) return -EINVAL; if (!priv->phy) @@ -1181,6 +1188,7 @@ fail: static int cpmac_remove(struct platform_device *pdev) { struct net_device *dev = platform_get_drvdata(pdev); + unregister_netdev(dev); free_netdev(dev); return 0;