From patchwork Sat Sep 13 19:05:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 388957 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 8EFC414009E for ; Sun, 14 Sep 2014 05:06:26 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752148AbaIMTGK (ORCPT ); Sat, 13 Sep 2014 15:06:10 -0400 Received: from mout.gmx.net ([212.227.15.19]:59612 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752037AbaIMTGJ (ORCPT ); Sat, 13 Sep 2014 15:06:09 -0400 Received: from ubnt.fritz.box ([88.152.150.53]) by mail.gmx.com (mrgmx001) with ESMTPSA (Nemesis) id 0MD9q8-1XYOxM08TM-00GWqm; Sat, 13 Sep 2014 21:06:04 +0200 From: Heinrich Schuchardt To: David Daney Cc: "David S. Miller" , Luka Perkov , Willem de Bruijn , Russell King , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Heinrich Schuchardt Subject: [PATCH] netdev: octeon_mgmt: ISO C90 forbids mixed declarations and code Date: Sat, 13 Sep 2014 21:05:08 +0200 Message-Id: <1410635108-3589-1-git-send-email-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.1.0 X-Provags-ID: V03:K0:xZWoMTFvSt0qayh8GwRsoygr1TUknsExR/ypdXBFVlAI2iYev6x eR4y5XYbtcWhc+XQJO+rFzKGZ1FmWdoJEVZfpV8KX5gajCtfv9oPi2n8eN0ZWHrgRWMjut4 RoZTO4LcqXQYPES/G4GcJVwyVnbjwomxzqEg2YYuSzq3PawLHUIDHbN0U4BT9HzhtRo50vZ ciGrRVoFKhFJiJFcaOYnQ== X-UI-Out-Filterresults: notjunk:1; Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Compiling with OCTEON_MGMT_ETHERNET gives a warning drivers/net/ethernet/octeon/octeon_mgmt.c:295:4: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] The patch cleans up the code. Signed-off-by: Heinrich Schuchardt --- drivers/net/ethernet/octeon/octeon_mgmt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c index 979c698..8af453a 100644 --- a/drivers/net/ethernet/octeon/octeon_mgmt.c +++ b/drivers/net/ethernet/octeon/octeon_mgmt.c @@ -254,6 +254,7 @@ static void octeon_mgmt_clean_tx_buffers(struct octeon_mgmt *p) struct sk_buff *skb; int cleaned = 0; unsigned long flags; + u64 ns; mix_orcnt.u64 = cvmx_read_csr(p->mix + MIX_ORCNT); while (mix_orcnt.s.orcnt) { @@ -292,7 +293,7 @@ static void octeon_mgmt_clean_tx_buffers(struct octeon_mgmt *p) struct skb_shared_hwtstamps ts; memset(&ts, 0, sizeof(ts)); /* Read the timestamp */ - u64 ns = cvmx_read_csr(CVMX_MIXX_TSTAMP(p->port)); + ns = cvmx_read_csr(CVMX_MIXX_TSTAMP(p->port)); /* Remove the timestamp from the FIFO */ cvmx_write_csr(CVMX_MIXX_TSCTL(p->port), 0); /* Tell the kernel about the timestamp */