From patchwork Tue Jun 12 01:19:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 164302 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 671F5B6FC4 for ; Tue, 12 Jun 2012 11:21:04 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753232Ab2FLBVB (ORCPT ); Mon, 11 Jun 2012 21:21:01 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:61421 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753150Ab2FLBVA (ORCPT ); Mon, 11 Jun 2012 21:21:00 -0400 Received: by pbbrp8 with SMTP id rp8so59936pbb.19 for ; Mon, 11 Jun 2012 18:21:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=1KdeTiC2RAKU8mDdizQYOMtxN/oS02lk8q4WcPVYcaY=; b=OzHZ0r+NmK6LFIA6w/A9LI2yE8F/PGq4vJ0ac43TxTxim2tpDedXptqgh6BUwrkvQh yz9f+6sBSXGyEsKLhnP5IFrb9j6dfaF7YOjSqXdUiZR0pqCBsLh79HJtX0rkybMdDc56 FvIeB9c2Ij/7ygKgXgI3MQtr2zCTEJE74PVB/uV3svUYHE06UuY71EQkUiC9DUyeH9G2 sG18vv22sMBmzSwKMthnlszQf/XoLits3epuyhAUxLgBUizUeQpSMwv3rmoCfgDLRZ5T GYQ4cjxp1l55CsnpHfNA+s+rxcCFB4M5ekV0P+GCHTVpcCARmm512+XgkN7A69fIs4RQ lU8g== Received: by 10.68.227.163 with SMTP id sb3mr33044486pbc.74.1339464060006; Mon, 11 Jun 2012 18:21:00 -0700 (PDT) Received: from localhost ([183.37.205.112]) by mx.google.com with ESMTPS id ve4sm102978pbc.55.2012.06.11.18.20.55 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 11 Jun 2012 18:20:59 -0700 (PDT) From: Ming Lei To: "David S. Miller" , Greg Kroah-Hartman Cc: Oliver Neukum , netdev@vger.kernel.org, linux-usb@vger.kernel.org, Ming Lei Subject: [PATCH 6/7] usbnet: remove declaration for intr_complete Date: Tue, 12 Jun 2012 09:19:44 +0800 Message-Id: <1339463985-9006-7-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1339463985-9006-1-git-send-email-tom.leiming@gmail.com> References: <1339463985-9006-1-git-send-email-tom.leiming@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove declaration for intr_complete so that ctags may be happy to decrease duplicated symbols, also decrease one line code. Signed-off-by: Ming Lei --- drivers/net/usb/usbnet.c | 72 ++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 96f8a08..f4bd5fa 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -180,7 +180,41 @@ int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress) } EXPORT_SYMBOL_GPL(usbnet_get_ethernet_addr); -static void intr_complete (struct urb *urb); +static void intr_complete (struct urb *urb) +{ + struct usbnet *dev = urb->context; + int status = urb->status; + + switch (status) { + /* success */ + case 0: + dev->driver_info->status(dev, urb); + break; + + /* software-driven interface shutdown */ + case -ENOENT: /* urb killed */ + case -ESHUTDOWN: /* hardware gone */ + netif_dbg(dev, ifdown, dev->net, + "intr shutdown, code %d\n", status); + return; + + /* NOTE: not throttling like RX/TX, since this endpoint + * already polls infrequently + */ + default: + netdev_dbg(dev->net, "intr status %d\n", status); + break; + } + + if (!netif_running (dev->net)) + return; + + memset(urb->transfer_buffer, 0, urb->transfer_buffer_length); + status = usb_submit_urb (urb, GFP_ATOMIC); + if (status != 0) + netif_err(dev, timer, dev->net, + "intr resubmit --> %d\n", status); +} static int init_status (struct usbnet *dev, struct usb_interface *intf) { @@ -519,42 +553,6 @@ block: netif_dbg(dev, rx_err, dev->net, "no read resubmitted\n"); } -static void intr_complete (struct urb *urb) -{ - struct usbnet *dev = urb->context; - int status = urb->status; - - switch (status) { - /* success */ - case 0: - dev->driver_info->status(dev, urb); - break; - - /* software-driven interface shutdown */ - case -ENOENT: /* urb killed */ - case -ESHUTDOWN: /* hardware gone */ - netif_dbg(dev, ifdown, dev->net, - "intr shutdown, code %d\n", status); - return; - - /* NOTE: not throttling like RX/TX, since this endpoint - * already polls infrequently - */ - default: - netdev_dbg(dev->net, "intr status %d\n", status); - break; - } - - if (!netif_running (dev->net)) - return; - - memset(urb->transfer_buffer, 0, urb->transfer_buffer_length); - status = usb_submit_urb (urb, GFP_ATOMIC); - if (status != 0) - netif_err(dev, timer, dev->net, - "intr resubmit --> %d\n", status); -} - /*-------------------------------------------------------------------------*/ void usbnet_pause_rx(struct usbnet *dev) {