On Tue, Nov 25, 2014 at 01:26:14PM +0000, Luis de Bethencourt wrote:
> This patch fixes the checkpatch.pl warnings:
> 
> WARNING: line over 80 characters
> +                       int cores_in_use = core_state.baseline_cores - 
> atomic_read(&core_state.available_cores);
> 
> WARNING: line over 80 characters
> +                       skb->data = skb->head + work->packet_ptr.s.addr - 
> cvmx_ptr_to_phys(skb->head);
> 
> Signed-off-by: Luis de Bethencourt <l...@debethencourt.com>
> ---
>  drivers/staging/octeon/ethernet-rx.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/octeon/ethernet-rx.c 
> b/drivers/staging/octeon/ethernet-rx.c
> index 44e372f..bd83f55 100644
> --- a/drivers/staging/octeon/ethernet-rx.c
> +++ b/drivers/staging/octeon/ethernet-rx.c
> @@ -295,7 +295,8 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, 
> int budget)
>                        */
>                       union cvmx_pow_wq_int_cntx counts;
>                       int backlog;
> -                     int cores_in_use = core_state.baseline_cores - 
> atomic_read(&core_state.available_cores);
> +                     int cores_in_use = core_state.baseline_cores -
> +                             atomic_read(&core_state.available_cores);
>                       counts.u64 = 
> cvmx_read_csr(CVMX_POW_WQ_INT_CNTX(pow_receive_group));
>                       backlog = counts.s.iq_cnt + counts.s.ds_cnt;
>                       if (backlog > budget * cores_in_use && napi != NULL)
> @@ -324,7 +325,8 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, 
> int budget)
>                * buffer.
>                */
>               if (likely(skb_in_hw)) {
> -                     skb->data = skb->head + work->packet_ptr.s.addr - 
> cvmx_ptr_to_phys(skb->head);
> +                     skb->data = skb->head + work->packet_ptr.s.addr -
> +                             cvmx_ptr_to_phys(skb->head);
>                       prefetch(skb->data);
>                       skb->len = work->len;
>                       skb_set_tail_pointer(skb, skb->len);
> -- 
> 2.1.3

No longer applies to my tree :(
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to