Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754913AbaKSOCw (ORCPT ); Wed, 19 Nov 2014 09:02:52 -0500 Received: from mail-lb0-f174.google.com ([209.85.217.174]:64989 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752065AbaKSOCu (ORCPT ); Wed, 19 Nov 2014 09:02:50 -0500 Message-ID: <546CA307.7020407@cogentembedded.com> Date: Wed, 19 Nov 2014 17:02:47 +0300 From: Sergei Shtylyov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Hayes Wang , netdev@vger.kernel.org CC: nic_swsd@realtek.com, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: Re: [PATCH net-next v2 1/2] r8152: adjust r8152_submit_rx References: <1394712342-15778-88-Taiwan-albertk@realtek.com> <1394712342-15778-95-Taiwan-albertk@realtek.com> <1394712342-15778-96-Taiwan-albertk@realtek.com> In-Reply-To: <1394712342-15778-96-Taiwan-albertk@realtek.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello. On 11/19/2014 8:20 AM, Hayes Wang wrote: > The behavior of handling the returned status from r8152_submit_rx() > is almost same, so let r8152_submit_rx() deal with the error > directly. This could avoid the duplicate code. > Signed-off-by: Hayes Wang > --- > drivers/net/usb/r8152.c | 41 +++++++++++++++++++++-------------------- > 1 file changed, 21 insertions(+), 20 deletions(-) > > diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c > index 0a30fd3..df0868b 100644 > --- a/drivers/net/usb/r8152.c > +++ b/drivers/net/usb/r8152.c [...] > @@ -1806,11 +1789,29 @@ static void bottom_half(unsigned long data) > static > int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags) > { > + int ret = 0; Initialization not needed. > + > usb_fill_bulk_urb(agg->urb, tp->udev, usb_rcvbulkpipe(tp->udev, 1), > agg->head, agg_buf_sz, > (usb_complete_t)read_bulk_callback, agg); > > - return usb_submit_urb(agg->urb, mem_flags); > + ret = usb_submit_urb(agg->urb, mem_flags); > + Empty line not needed here either. > + if (ret == -ENODEV) { > + set_bit(RTL8152_UNPLUG, &tp->flags); > + netif_device_detach(tp->netdev); > + } else if (ret) { > + struct urb *urb = agg->urb; > + unsigned long flags; > + > + urb->actual_length = 0; > + spin_lock_irqsave(&tp->rx_lock, flags); > + list_add_tail(&agg->list, &tp->rx_done); > + spin_unlock_irqrestore(&tp->rx_lock, flags); > + tasklet_schedule(&tp->tl); > + } > + > + return ret; > } [...] WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/