From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Daney Subject: Re: [PATCH] drivers: net: ethernet: octeon_mgmt: fix a compiler warning Date: Mon, 08 Sep 2014 09:36:28 -0700 Message-ID: <540DDB0C.3070901@gmail.com> References: <1410188513-2541-1-git-send-email-aaro.koskinen@nsn.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: David Daney To: Aaro Koskinen , netdev@vger.kernel.org, David Miller Return-path: Received: from mail-ie0-f173.google.com ([209.85.223.173]:57982 "EHLO mail-ie0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752925AbaIHQgb (ORCPT ); Mon, 8 Sep 2014 12:36:31 -0400 Received: by mail-ie0-f173.google.com with SMTP id lx4so18140340iec.18 for ; Mon, 08 Sep 2014 09:36:30 -0700 (PDT) In-Reply-To: <1410188513-2541-1-git-send-email-aaro.koskinen@nsn.com> Sender: netdev-owner@vger.kernel.org List-ID: On 09/08/2014 08:01 AM, Aaro Koskinen wrote: > Fix the following compiler warning: > > drivers/net/ethernet/octeon/octeon_mgmt.c: In function 'octeon_mgmt_clean_tx_buffers': > drivers/net/ethernet/octeon/octeon_mgmt.c:295:4: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] > u64 ns = cvmx_read_csr(CVMX_MIXX_TSTAMP(p->port)); > ^ > > Signed-off-by: Aaro Koskinen For some reason we missed this when the initial patch was created. Thanks for fixing it... Acked-by: David Daney > --- > drivers/net/ethernet/octeon/octeon_mgmt.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c > index 979c698..a422930 100644 > --- a/drivers/net/ethernet/octeon/octeon_mgmt.c > +++ b/drivers/net/ethernet/octeon/octeon_mgmt.c > @@ -290,9 +290,11 @@ 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; > + u64 ns; > + > 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 */ >