Message ID | 1410670935-904-1-git-send-email-xypron.glpk@gmx.de |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
On 09/13/2014 10:02 PM, Heinrich Schuchardt wrote: > Revised patch takes into account comments by Joe and David. > > 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> > CC: Joe Perches <joe@perches.com> > CC: David S. Miller <davem@davemloft.net> > --- > 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..6cc68b1 100644 > --- a/drivers/net/ethernet/octeon/octeon_mgmt.c > +++ b/drivers/net/ethernet/octeon/octeon_mgmt.c > @@ -290,9 +290,10 @@ 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)); I don't think this is the change suggested by Joe Perches and davem. So NAK. In the interestes of Bike Shedding, I will send a patch that clears the warning with a fewer number of changed lines, that follows the suggestion. David Daney > /* 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
diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c index 979c698..6cc68b1 100644 --- a/drivers/net/ethernet/octeon/octeon_mgmt.c +++ b/drivers/net/ethernet/octeon/octeon_mgmt.c @@ -290,9 +290,10 @@ 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 */
Revised patch takes into account comments by Joe and David. 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> CC: Joe Perches <joe@perches.com> CC: David S. Miller <davem@davemloft.net> --- drivers/net/ethernet/octeon/octeon_mgmt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)