From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753795AbaK0ClU (ORCPT ); Wed, 26 Nov 2014 21:41:20 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:45984 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753643AbaK0ClQ (ORCPT ); Wed, 26 Nov 2014 21:41:16 -0500 Date: Wed, 26 Nov 2014 18:34:10 -0800 From: Greg KH To: Luis de Bethencourt Cc: linux-kernel@vger.kernel.org, eunb.song@samsung.com, gulsah.1004@gmail.com, paul.gortmaker@windriver.com, devel@driverdev.osuosl.org Subject: Re: [PATCH] staging: octeon: Fix checkpatch warning Message-ID: <20141127023410.GA7283@kroah.com> References: <20141125132614.GA23857@biggie> <20141126214523.GA10037@kroah.com> <20141127003523.GA3249@biggie> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20141127003523.GA3249@biggie> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Nov 27, 2014 at 12:35:23AM +0000, Luis de Bethencourt wrote: > On Wed, Nov 26, 2014 at 01:45:23PM -0800, Greg KH wrote: > > 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 > > > --- > > > 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 :( > > I'm confused. > > I just tried applying it to what I think is your tree is and it worked. > https://git.kernel.org/cgit/linux/kernel/git/gregkh/staging.git/log/?h=staging-next > > Do I have this wrong? I'm applying patches first to staging-testing to get some 0-day buildbot testing before merging them to staging-next these days, as I've been burned with common problems too many times. I took some other octeon patches that were sent before yours were that caused the conflict. If you look at staging-testing right now you can see that. Hope this helps, greg k-h