From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754203AbaIOQri (ORCPT ); Mon, 15 Sep 2014 12:47:38 -0400 Received: from mail-bn1bon0053.outbound.protection.outlook.com ([157.56.111.53]:16016 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753046AbaIOQrg (ORCPT ); Mon, 15 Sep 2014 12:47:36 -0400 X-Greylist: delayed 900 seconds by postgrey-1.27 at vger.kernel.org; Mon, 15 Sep 2014 12:47:35 EDT Message-ID: <5417149D.2070301@caviumnetworks.com> Date: Mon, 15 Sep 2014 09:32:29 -0700 From: David Daney User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: David Daney CC: , "David S. Miller" , , , David Daney , Heinrich Schuchardt , Joe Perches Subject: Re: [PATCH] netdev: octeon_mgmt: Fix ISO C90 forbids mixed declarations and code warning. References: <1410798223-21420-1-git-send-email-ddaney.cavm@gmail.com> In-Reply-To: <1410798223-21420-1-git-send-email-ddaney.cavm@gmail.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [64.2.3.195] X-ClientProxiedBy: BY2PR07CA049.namprd07.prod.outlook.com (10.141.251.24) To BY2PR07MB583.namprd07.prod.outlook.com (10.141.221.155) X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;UriScan:; X-Forefront-PRVS: 03355EE97E X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(189002)(199003)(377454003)(51704005)(479174003)(24454002)(4396001)(23756003)(21056001)(83506001)(110136001)(95666004)(64126003)(46102001)(50466002)(42186005)(87976001)(105586002)(81156004)(106356001)(85306004)(69596002)(77096002)(53416004)(107046002)(74662001)(31966008)(76482001)(74502001)(33656002)(85852003)(83072002)(79102001)(66066001)(36756003)(65816999)(92566001)(92726001)(97736003)(19580395003)(101416001)(76176999)(87266999)(64706001)(65956001)(102836001)(65806001)(80316001)(77982001)(80022001)(19580405001)(83322001)(20776003)(47776003)(54356999)(81542001)(81342001)(50986999)(99396002)(90102001);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR07MB583;H:dl.caveonetworks.com;FPR:;MLV:sfv;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-OriginatorOrg: caviumnetworks.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/15/2014 09:23 AM, David Daney wrote: > From: David Daney > > We were getting: > > drivers/net/ethernet/octeon/octeon_mgmt.c:295:4: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] > > The idea of the fix from Joe Perches. > > Signed-off-by: David Daney > Cc: Heinrich Schuchardt > Cc: Joe Perches Actually Aaro Koskinen's similar patch was just committed to the net.git tree (commit 208f7ca4d4a6886256763c9c073775c5fdaf47eb), so this whole thing seems to have been an exercise in time wasting. I don't really care which patch goes in at this point. So I defer to davem et al. David Daney > --- > > This patch should supersede previous patches from Heinrich Schuchardt, > and may be preferable as it touches fewer lines of code. > > drivers/net/ethernet/octeon/octeon_mgmt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c > index 979c698..5e10c1d 100644 > --- a/drivers/net/ethernet/octeon/octeon_mgmt.c > +++ b/drivers/net/ethernet/octeon/octeon_mgmt.c > @@ -290,12 +290,12 @@ static void octeon_mgmt_clean_tx_buffers(struct octeon_mgmt *p) > /* Read the hardware TX timestamp if one was recorded */ > if (unlikely(re.s.tstamp)) { > struct skb_shared_hwtstamps ts; > - memset(&ts, 0, sizeof(ts)); > /* Read the timestamp */ > u64 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 */ > + memset(&ts, 0, sizeof(ts)); > ts.hwtstamp = ns_to_ktime(ns); > skb_tstamp_tx(skb, &ts); > } >