From patchwork Thu Oct 29 15:07:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Neukum X-Patchwork-Id: 37198 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 92459B7C08 for ; Fri, 30 Oct 2009 02:05:13 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754429AbZJ2PFA (ORCPT ); Thu, 29 Oct 2009 11:05:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754401AbZJ2PFA (ORCPT ); Thu, 29 Oct 2009 11:05:00 -0400 Received: from smtp-out003.kontent.com ([81.88.40.217]:52491 "EHLO smtp-out003.kontent.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754304AbZJ2PFA (ORCPT ); Thu, 29 Oct 2009 11:05:00 -0400 Received: from linux-d698.localnet (213-23-10-108.accor-hotels.arcor-ip.net [213.23.10.108]) (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 553FF4000270; Thu, 29 Oct 2009 16:05:04 +0100 (CET) From: Oliver Neukum To: Sarah Sharp , davem@davemloft.net, netdev@vger.kernel.org Subject: [patch]convert kaweth to use usb_reset_configuration() Date: Thu, 29 Oct 2009 16:07:12 +0100 User-Agent: KMail/1.10.3 (Linux/2.6.31-rc9-0.1-default; KDE/4.1.3; x86_64; ; ) MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200910291607.12382.oliver@neukum.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org For USB 3.0 it is necessary that all drivers use the standard API to reset a configuration. This removes a home-grown implementation. Signed-off-by: Oliver Neukum Hi David, please take this for the next merge window. Regards Oliver --- -- 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 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c @@ -471,16 +471,7 @@ static int kaweth_reset(struct kaweth_device *kaweth) int result; dbg("kaweth_reset(%p)", kaweth); - result = kaweth_control(kaweth, - usb_sndctrlpipe(kaweth->dev, 0), - USB_REQ_SET_CONFIGURATION, - 0, - kaweth->dev->config[0].desc.bConfigurationValue, - 0, - NULL, - 0, - KAWETH_CONTROL_TIMEOUT); - + result = usb_reset_configuration(kaweth->dev); mdelay(10); dbg("kaweth_reset() returns %d.",result);