From patchwork Wed Aug 19 19:35:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Neukum X-Patchwork-Id: 31665 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id D5970B708B for ; Thu, 20 Aug 2009 05:34:13 +1000 (EST) Received: by ozlabs.org (Postfix) id BC9C3DDD0C; Thu, 20 Aug 2009 05:34:13 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 56D6BDDD04 for ; Thu, 20 Aug 2009 05:34:13 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752806AbZHSTeE (ORCPT ); Wed, 19 Aug 2009 15:34:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752694AbZHSTeE (ORCPT ); Wed, 19 Aug 2009 15:34:04 -0400 Received: from smtp-out003.kontent.com ([81.88.40.217]:48297 "EHLO smtp-out003.kontent.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751850AbZHSTeC (ORCPT ); Wed, 19 Aug 2009 15:34:02 -0400 Received: from linux-d698.localnet (p549A2223.dip0.t-ipconnect.de [84.154.34.35]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: neukum_org@smtp-out003.kontent.com) by smtp-out003.kontent.com (Postfix) with ESMTPSA id BC6844000366; Wed, 19 Aug 2009 21:34:02 +0200 (CEST) From: Oliver Neukum To: Alan Stern , linux-usb@vger.kernel.org, netdev@vger.kernel.org Subject: [patch]replace runtime power management primitives in kaweth driver Date: Wed, 19 Aug 2009 21:35:01 +0200 User-Agent: KMail/1.10.3 (Linux/2.6.31-rc4-0.1-default; KDE/4.1.3; x86_64; ; ) MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200908192135.01422.oliver@neukum.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch removes a rare use of the USB power management API which won't be supported after the conversion to the new generic runtime power management framework. Functionality is not altered. Signed-off-by: Oliver Neukum Hi, please accept this for the next merge window. It will be needed for the adoption of the generic framework for USB. Regards Oliver --- commit eb6ea8b517c6390e85585aa3f24483840296487e Author: Oliver Neukum Date: Wed Aug 19 20:27:42 2009 +0200 usb: remove rare pm primitive for conversion to new API -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index 1f9ec29..6db2c70 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c @@ -721,7 +721,7 @@ static int kaweth_open(struct net_device *net) return 0; err_out: - usb_autopm_enable(kaweth->intf); + usb_autopm_put_interface(kaweth->intf); return -EIO; } @@ -758,7 +758,7 @@ static int kaweth_close(struct net_device *net) kaweth->status &= ~KAWETH_STATUS_CLOSING; - usb_autopm_enable(kaweth->intf); + usb_autopm_put_interface(kaweth->intf); return 0; }