From patchwork Wed Jul 23 17:42:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 373018 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 26F72140171 for ; Thu, 24 Jul 2014 03:43:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932764AbaGWRno (ORCPT ); Wed, 23 Jul 2014 13:43:44 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:44734 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932674AbaGWRnl (ORCPT ); Wed, 23 Jul 2014 13:43:41 -0400 Received: by mail-pa0-f54.google.com with SMTP id fa1so2113471pad.41 for ; Wed, 23 Jul 2014 10:43:40 -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=GDR40QZc9fEJZV0Q6qWJJXnBs6kE3/pKvZR6daXuHes=; b=karHZcoZSo7wtXCDwJHSXE8tyXinepurv1kviWr8BSRkNYj3eqEbPM6WKWm6GA9T0y 09zIPBru2W+G8bnopJPsvGXfOmMCjXdCHshp7EIOiFuvwYI+ZRr/NxVHivRZnVQYkXkv 2i7wJydmalLyrBw+hAhPtmV727oX/1EWXRhAPg8SKF6HNR91Mz4n497OiTPEYcaF6yyx VkcBg/3Yv61qlffXc00Y+WNapf+VllP1bwTYBzZ5EjV/mY/Fm5kVIMROwxngzGzMi9so kPB4I6va4FFTMC4IXdeOBnUF6u6zv30kqHE3vlELOUAOIN6AWnPk2yMm7avEAo9NOq4F ilnw== X-Received: by 10.68.186.33 with SMTP id fh1mr3913588pbc.140.1406137420716; Wed, 23 Jul 2014 10:43:40 -0700 (PDT) Received: from fainelli-desktop.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by mx.google.com with ESMTPSA id pl10sm3001650pbb.56.2014.07.23.10.43.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Jul 2014 10:43:40 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, Florian Fainelli Subject: [PATCH net-next v2 3/5] net: bcmgenet: add and remove missing blank lines Date: Wed, 23 Jul 2014 10:42:13 -0700 Message-Id: <1406137335-1671-4-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1406137335-1671-1-git-send-email-f.fainelli@gmail.com> References: <1406137335-1671-1-git-send-email-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org checkpatch.pl flagged two blank lines which are not needed, and one that was missing, fix them. Signed-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 0f65b4a4d4a4..25aa42b6cd34 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -619,7 +619,6 @@ static void bcmgenet_get_drvinfo(struct net_device *dev, strlcpy(info->driver, "bcmgenet", sizeof(info->driver)); strlcpy(info->version, "v2.0", sizeof(info->version)); info->n_stats = BCMGENET_STATS_LEN; - } static int bcmgenet_get_sset_count(struct net_device *dev, int string_set) @@ -1268,7 +1267,6 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_priv *priv, while ((rxpktprocessed < rxpkttoprocess) && (rxpktprocessed < budget)) { - /* Unmap the packet contents such that we can use the * RSV from the 64 bytes descriptor when enabled and save * a 32-bits register read @@ -1286,6 +1284,7 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_priv *priv, DMA_DESC_SIZE)); } else { struct status_64 *status; + status = (struct status_64 *)skb->data; dma_length_status = status->length_status; } @@ -1408,7 +1407,6 @@ static int bcmgenet_alloc_rx_buffers(struct bcmgenet_priv *priv) ret = bcmgenet_rx_refill(priv, cb); if (ret) break; - } return ret;