From patchwork Tue Jun 12 01:19:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 164299 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 C8D7CB6FC2 for ; Tue, 12 Jun 2012 11:20:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753228Ab2FLBUe (ORCPT ); Mon, 11 Jun 2012 21:20:34 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:51886 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753212Ab2FLBUd (ORCPT ); Mon, 11 Jun 2012 21:20:33 -0400 Received: by dady13 with SMTP id y13so6140776dad.19 for ; Mon, 11 Jun 2012 18:20:32 -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=NYwtQ0ZsQZe4HeCvZfRCus6471c3Ng78IhJcZ+U1UPg=; b=Hnoz4lMuMNAztJSO2tMw2vilQCA6CtGW2KxQv/VBtzYghZg+bREo9ysLL3fhOQ4mvp FI0IB6Z2Q0QMLZ3nb+pqgtbzPzzEVgl+dGaqfe+H9udmdOez7g7pAVkz8r+26JpTkjGQ bWLPJFblVtrfRnqqdQItSqLR/20PrYTLPZXLFYlgI+BjJx3k4jrMJVyCjvc2RtQ8Foq1 /CPDXnV5cS4k0MwJj0foQJdIAX/qzYqOVGnGDC/XML1qjF6/u16j/gDaeaNudS7cUflb B4ozE9sLBGPJ85K4qtQpiTIHsOuc+qCLmK1WPPd3SeNs+/0N2vQ1Rg4jUA5rs4T7pqhN SG+A== Received: by 10.68.221.106 with SMTP id qd10mr33295932pbc.42.1339464032803; Mon, 11 Jun 2012 18:20:32 -0700 (PDT) Received: from localhost ([183.37.205.112]) by mx.google.com with ESMTPS id hb5sm101369pbc.58.2012.06.11.18.20.27 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 11 Jun 2012 18:20:32 -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 3/7] usbnet:cdc-phonet: remove usb_get/put_dev in .probe and .disconnect Date: Tue, 12 Jun 2012 09:19:41 +0800 Message-Id: <1339463985-9006-4-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 usb_device is parent device of usb_interface in the view of driver model, so its reference count is always held during .probe/.disconnect of usb_interface instance. This patch just removes the unnecessay usb_get/put_dev. Signed-off-by: Ming Lei --- drivers/net/usb/cdc-phonet.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c index d848d4d..187c144 100644 --- a/drivers/net/usb/cdc-phonet.c +++ b/drivers/net/usb/cdc-phonet.c @@ -394,7 +394,7 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id) SET_NETDEV_DEV(dev, &intf->dev); pnd->dev = dev; - pnd->usb = usb_get_dev(usbdev); + pnd->usb = usbdev; pnd->intf = intf; pnd->data_intf = data_intf; spin_lock_init(&pnd->tx_lock); @@ -440,7 +440,6 @@ out: static void usbpn_disconnect(struct usb_interface *intf) { struct usbpn_dev *pnd = usb_get_intfdata(intf); - struct usb_device *usb = pnd->usb; if (pnd->disconnected) return; @@ -449,7 +448,6 @@ static void usbpn_disconnect(struct usb_interface *intf) usb_driver_release_interface(&usbpn_driver, (pnd->intf == intf) ? pnd->data_intf : pnd->intf); unregister_netdev(pnd->dev); - usb_put_dev(usb); } static struct usb_driver usbpn_driver = {