From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752122AbdGYNac (ORCPT ); Tue, 25 Jul 2017 09:30:32 -0400 Received: from smtprelay0254.hostedemail.com ([216.40.44.254]:45361 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750980AbdGYNa3 (ORCPT ); Tue, 25 Jul 2017 09:30:29 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::::::::::::::,RULES_HIT:41:69:355:379:541:599:800:960:966:973:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1544:1593:1594:1711:1730:1747:1777:1792:2194:2196:2199:2200:2393:2559:2562:2828:3138:3139:3140:3141:3142:3355:3622:3865:3866:3867:3870:3871:3872:4225:4321:4385:5007:7514:7576:7903:8603:9592:10004:10848:11026:11232:11473:11658:11783:11914:12043:12048:12296:12438:12555:12683:12740:12895:13439:13894:14181:14659:14721:21080:21434:21627:30012:30054:30079:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:3,LUA_SUMMARY:none X-HE-Tag: blow02_3e1bad758660b X-Filterd-Recvd-Size: 4951 Message-ID: <1500989425.6516.2.camel@perches.com> Subject: Re: [PATCH] staging: octeon: fix line over 80 characters From: Joe Perches To: catalinnow@gmail.com, gregkh@linuxfoundation.org, aaro.koskinen@iki.fi, davem@davemloft.net, johannes.berg@intel.com, stephen@networkplumber.org, tklauser@distanz.ch, chuckleberryfinn@gmail.com, arnd@arndb.de Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Date: Tue, 25 Jul 2017 06:30:25 -0700 In-Reply-To: <1500987717-25307-1-git-send-email-catalinnow@gmail.com> References: <1500987717-25307-1-git-send-email-catalinnow@gmail.com> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.22.6-1ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2017-07-25 at 16:01 +0300, catalinnow@gmail.com wrote: > From: John Smith > > ethernet-rx.c: > > fix WARNING: line over 80 characters Instead of just shutting up checkpatch, how about restructuring the code a bit by adding a helper function to this very long cvm_oct_poll? > diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c [] > @@ -323,7 +323,8 @@ static int cvm_oct_poll(struct oct_rx_group *rx_group, int budget) > segment_size = len; > /* Copy the data into the packet */ > skb_put_data(skb, > - cvmx_phys_to_ptr(segment_ptr.s.addr), > + cvmx_phys_to_ptr( > + segment_ptr.s.addr), > segment_size); > len -= segment_size; > segment_ptr = next_ptr; Something like (uncompiled, untested) ---  drivers/staging/octeon/ethernet-rx.c | 78 ++++++++++++++++++------------------  1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c index 72baedefa0f1..7315c8150dcb 100644 --- a/drivers/staging/octeon/ethernet-rx.c +++ b/drivers/staging/octeon/ethernet-rx.c @@ -149,6 +149,45 @@ static inline int cvm_oct_check_rcv_error(cvmx_wqe_t *work)   return 0;  }   +static void copy_segments_to_skb(cvmx_wqe_t *work, struct sk_buff *skb) +{ + int segments = work->word2.s.bufs; + union cvmx_buf_ptr segment_ptr = work->packet_ptr; + int len = work->word1.len; + + while (segments--) { + union cvmx_buf_ptr next_ptr; + + next_ptr = *(union cvmx_buf_ptr *) + cvmx_phys_to_ptr(segment_ptr.s.addr - 8); + + /* +  * Octeon Errata PKI-100: The segment size is wrong. +  * +  * Until it is fixed, calculate the segment size based on +  * the packet pool buffer size. +  * When it is fixed, the following line should be replaced +  * with this one: +  * int segment_size = segment_ptr.s.size; +  */ + int segment_size = + CVMX_FPA_PACKET_POOL_SIZE - + (segment_ptr.s.addr - +  (((segment_ptr.s.addr >> 7) - +    segment_ptr.s.back) << 7)); + + /* Don't copy more than what is left in the packet */ + if (segment_size > len) + segment_size = len; + + /* Copy the data into the packet */ + skb_put_data(skb, cvmx_phys_to_ptr(segment_ptr.s.addr), +      segment_size); + len -= segment_size; + segment_ptr = next_ptr; + } +} +  static int cvm_oct_poll(struct oct_rx_group *rx_group, int budget)  {   const int coreid = cvmx_get_core_num(); @@ -290,44 +329,7 @@ static int cvm_oct_poll(struct oct_rx_group *rx_group, int budget)   skb_put_data(skb, ptr, work->word1.len);   /* No packet buffers to free */   } else { - int segments = work->word2.s.bufs; - union cvmx_buf_ptr segment_ptr = -     work->packet_ptr; - int len = work->word1.len; - - while (segments--) { - union cvmx_buf_ptr next_ptr = -     *(union cvmx_buf_ptr *) -       cvmx_phys_to_ptr( -       segment_ptr.s.addr - 8); - - /* -  * Octeon Errata PKI-100: The segment size is -  * wrong. Until it is fixed, calculate the -  * segment size based on the packet pool -  * buffer size. When it is fixed, the -  * following line should be replaced with this -  * one: int segment_size = -  * segment_ptr.s.size; -  */ - int segment_size = -     CVMX_FPA_PACKET_POOL_SIZE - -     (segment_ptr.s.addr - -      (((segment_ptr.s.addr >> 7) - -        segment_ptr.s.back) << 7)); - /* -  * Don't copy more than what -  * is left in the packet. -  */ - if (segment_size > len) - segment_size = len; - /* Copy the data into the packet */ - skb_put_data(skb, -      cvmx_phys_to_ptr(segment_ptr.s.addr), -      segment_size); - len -= segment_size; - segment_ptr = next_ptr; - } + copy_segments_to_skb(work, skb);   }   packet_not_copied = 0;   }