| Message ID | 1410635108-3589-1-git-send-email-xypron.glpk@gmx.de |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sat, 2014-09-13 at 21:05 +0200, Heinrich Schuchardt wrote: > 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] Maybe better to move the memset after the declaration. > diff --git 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 */ -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Joe Perches <joe@perches.com> Date: Sat, 13 Sep 2014 12:11:12 -0700 > On Sat, 2014-09-13 at 21:05 +0200, Heinrich Schuchardt wrote: >> 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] > > Maybe better to move the memset after the declaration. Totally agree, keep the variable in the innermost scope in which it is used. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 */
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 <xypron.glpk@gmx.de> --- drivers/net/ethernet/octeon/octeon_mgmt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)