From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751891AbcERGa3 (ORCPT ); Wed, 18 May 2016 02:30:29 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:54879 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751062AbcERGa1 (ORCPT ); Wed, 18 May 2016 02:30:27 -0400 Date: Tue, 17 May 2016 23:30:24 -0700 From: Guenter Roeck To: Heinrich Schuchardt Cc: Petko Manolov , linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [1/1] net: pegasus: remove dead coding Message-ID: <20160518063024.GA29326@roeck-us.net> References: <1463530410-12772-1-git-send-email-xypron.glpk@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1463530410-12772-1-git-send-email-xypron.glpk@gmx.de> User-Agent: Mutt/1.5.23 (2014-03-12) X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 18, 2016 at 02:13:30AM +0200, Heinrich Schuchardt wrote: > (!count || count < 4) is always true. Even if count >= 4 ? Guenter > So let's remove the coding which is dead at least since 2005. > > Signed-off-by: Heinrich Schuchardt > > --- > drivers/net/usb/pegasus.c | 53 ----------------------------------------------- > 1 file changed, 53 deletions(-) > > diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c > index 36cd7f0..1903d2e 100644 > --- a/drivers/net/usb/pegasus.c > +++ b/drivers/net/usb/pegasus.c > @@ -470,61 +470,8 @@ static void read_bulk_callback(struct urb *urb) > return; > default: > netif_dbg(pegasus, rx_err, net, "RX status %d\n", status); > - goto goon; > } > > - if (!count || count < 4) > - goto goon; > - > - rx_status = buf[count - 2]; > - if (rx_status & 0x1e) { > - netif_dbg(pegasus, rx_err, net, > - "RX packet error %x\n", rx_status); > - pegasus->stats.rx_errors++; > - if (rx_status & 0x06) /* long or runt */ > - pegasus->stats.rx_length_errors++; > - if (rx_status & 0x08) > - pegasus->stats.rx_crc_errors++; > - if (rx_status & 0x10) /* extra bits */ > - pegasus->stats.rx_frame_errors++; > - goto goon; > - } > - if (pegasus->chip == 0x8513) { > - pkt_len = le32_to_cpu(*(__le32 *)urb->transfer_buffer); > - pkt_len &= 0x0fff; > - pegasus->rx_skb->data += 2; > - } else { > - pkt_len = buf[count - 3] << 8; > - pkt_len += buf[count - 4]; > - pkt_len &= 0xfff; > - pkt_len -= 4; > - } > - > - /* > - * If the packet is unreasonably long, quietly drop it rather than > - * kernel panicing by calling skb_put. > - */ > - if (pkt_len > PEGASUS_MTU) > - goto goon; > - > - /* > - * at this point we are sure pegasus->rx_skb != NULL > - * so we go ahead and pass up the packet. > - */ > - skb_put(pegasus->rx_skb, pkt_len); > - pegasus->rx_skb->protocol = eth_type_trans(pegasus->rx_skb, net); > - netif_rx(pegasus->rx_skb); > - pegasus->stats.rx_packets++; > - pegasus->stats.rx_bytes += pkt_len; > - > - if (pegasus->flags & PEGASUS_UNPLUG) > - return; > - > - pegasus->rx_skb = __netdev_alloc_skb_ip_align(pegasus->net, PEGASUS_MTU, > - GFP_ATOMIC); > - > - if (pegasus->rx_skb == NULL) > - goto tl_sched; > goon: > usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb, > usb_rcvbulkpipe(pegasus->usb, 1),