[PATCH v2] staging: octeon: Fix checkpatch warnings

Dan Carpenter dan.carpenter at oracle.com
Fri Nov 28 10:29:28 UTC 2014


On Thu, Nov 27, 2014 at 05:18:10PM +0100, Luis de Bethencourt wrote:
> Fixing 80 character limit warnings in octeon/ethernet-rx.c
> 
> Signed-off-by: Luis de Bethencourt <luis at debethencourt.com>
> ---
>  drivers/staging/octeon/ethernet-rx.c | 51 +++++++++++++++++++++++++-----------
>  1 file changed, 35 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
> index 1789a12..e387eb1 100644
> --- a/drivers/staging/octeon/ethernet-rx.c
> +++ b/drivers/staging/octeon/ethernet-rx.c
> @@ -109,6 +109,7 @@ static inline int cvm_oct_check_rcv_error(cvmx_wqe_t *work)
>  		int interface = cvmx_helper_get_interface_num(work->ipprt);
>  		int index = cvmx_helper_get_interface_index_num(work->ipprt);
>  		union cvmx_gmxx_rxx_frm_ctl gmxx_rxx_frm_ctl;
> +

Do this in a separate patch.

> @@ -332,8 +343,10 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
>  				skb->protocol = eth_type_trans(skb, dev);
>  				skb->dev = dev;
>  
> -				if (unlikely(work->word2.s.not_IP || work->word2.s.IP_exc ||
> -					work->word2.s.L4_error || !work->word2.s.tcp_or_udp))
> +				if (unlikely(work->word2.s.not_IP ||
> +					work->word2.s.IP_exc ||
> +					work->word2.s.L4_error ||
> +					!work->word2.s.tcp_or_udp))
>  					skb->ip_summed = CHECKSUM_NONE;

Your patch aligns everything with tabs but it should be slightly
different.  Run your patch through checkpatch.pl --strict to see what I
mean and then redo it all.  This one should look like:

				if (unlikely(work->word2.s.not_IP ||
					     work->word2.s.IP_exc ||
					     work->word2.s.L4_error ||
					     !work->word2.s.tcp_or_udp))
					skb->ip_summed = CHECKSUM_NONE;

[tab][tab][tab][tab][tab][space][space][space][space][space]work->...

regards,
dan carpenter




More information about the devel mailing list