From patchwork Mon Jun 4 15:24:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Fritz X-Patchwork-Id: 162815 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 6AE7EB7036 for ; Tue, 5 Jun 2012 01:25:27 +1000 (EST) Received: from mail-bk0-f51.google.com (mail-bk0-f51.google.com [209.85.214.51]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 739F7B6F9F for ; Tue, 5 Jun 2012 01:24:13 +1000 (EST) Received: by bkcjg15 with SMTP id jg15so3737013bkc.38 for ; Mon, 04 Jun 2012 08:24:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; bh=guNEFAOZbyJPUEccPrSTJkuakfqASyOQ3xpLTY7rq+U=; b=GXQvzZkSQT/k0JHHMlqzskEqjDxefsEcImwuIZHRV7giWP+5NBm8/I0y37ButL2YlL kULSZe1RUT0LTiO6vBzHfg+QZUo54TNdNihwcTAJ6+OQXGnCWHQqKGS4GNS2PTcavCHI RZFsYTDlwgAKK/8VPa1nfxUOp9ejBgYM3IXadM2QErxTM8W7zmH9xNNg9isCnPRuwKrC SGjlBBXmwAIMNZFmkrDpDmPavvbA0c/qBJnJlNC+w2u9dPPt3CBdskRi63IyxA6W8bm9 0ii2nzHQdXQyvABjQyfS+wCRoQ1lcmBhUnf2Mf+x9l6VrC64sD/fMvp2Amp3akdoX3+A NOMA== Received: by 10.204.153.6 with SMTP id i6mr7002134bkw.114.1338823449801; Mon, 04 Jun 2012 08:24:09 -0700 (PDT) Received: from [192.168.1.2] (p4FD8312A.dip.t-dialin.net. [79.216.49.42]) by mx.google.com with ESMTPS id iq16sm10840798bkc.6.2012.06.04.08.24.05 (version=SSLv3 cipher=OTHER); Mon, 04 Jun 2012 08:24:07 -0700 (PDT) Subject: [PATCH] usb: gadget: regression fix - useage of usb_ep From: Christoph Fritz To: balbi@ti.com In-Reply-To: <20120604145917.GM8002@arwen.pp.htv.fi> References: <20120509000221.GA19525@lovely.krouter> <20120513225126.GA3683@lovely.krouter> <20120514042142.GD9750@kroah.com> <20120520231724.GA7941@mars> <1337583221.3394.21.camel@mars> <20120521065722.GA4363@mars> <20120521190450.GA27492@arwen.pp.htv.fi> <1338809424.3371.20.camel@mars> <20120604145917.GM8002@arwen.pp.htv.fi> Date: Mon, 04 Jun 2012 17:24:03 +0200 Message-ID: <1338823443.2979.3.camel@mars> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Cc: Ben Dooks , Chen Peter-B29397 , Nicolas Ferre , "Hans J. Koch" , Fabio Estevam , Kukjin Kim , Russell King , Thomas Dahlmann , Sascha Hauer , Christian Hemp , Haojian Zhuang , Daniel Mack , Neil Zhang , linux-arm-kernel , Oliver Neukum , Eric Miao , Li Yang-R58472 , Greg Kroah-Hartman , "linux-usb@vger.kernel.org" , Ido Shayevitz , Estevam Fabio-R49496 , "linuxppc-dev@lists.ozlabs.org" X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org This patch removes redundant pointer to struct usb_endpoint_descriptor which were missed in commit 79149b8: usb: gadget: Update fsl_udc_core to use usb_endpoint_descriptor inside the struct usb_ep Due to clock framework regressions, this patch is only compile tested! Signed-off-by: Christoph Fritz --- drivers/usb/gadget/fsl_udc_core.c | 2 +- drivers/usb/gadget/fsl_usb2_udc.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index 2831685..678ec4d 100644 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c @@ -2575,7 +2575,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev) /* for ep0: the desc defined here; * for other eps, gadget layer called ep_enable with defined desc */ - udc_controller->eps[0].desc = &fsl_ep0_desc; + udc_controller->eps[0].ep.desc = &fsl_ep0_desc; udc_controller->eps[0].ep.maxpacket = USB_MAX_CTRL_PAYLOAD; /* setup the udc->eps[] for non-control endpoints and link diff --git a/drivers/usb/gadget/fsl_usb2_udc.h b/drivers/usb/gadget/fsl_usb2_udc.h index 5cd7b7e..f61a967 100644 --- a/drivers/usb/gadget/fsl_usb2_udc.h +++ b/drivers/usb/gadget/fsl_usb2_udc.h @@ -568,10 +568,10 @@ static void dump_msg(const char *label, const u8 * buf, unsigned int length) /* * ### internal used help routines. */ -#define ep_index(EP) ((EP)->desc->bEndpointAddress&0xF) +#define ep_index(EP) ((EP)->ep.desc->bEndpointAddress&0xF) #define ep_maxpacket(EP) ((EP)->ep.maxpacket) #define ep_is_in(EP) ( (ep_index(EP) == 0) ? (EP->udc->ep0_dir == \ - USB_DIR_IN ):((EP)->desc->bEndpointAddress \ + USB_DIR_IN) : ((EP)->ep.desc->bEndpointAddress \ & USB_DIR_IN)==USB_DIR_IN) #define get_ep_by_pipe(udc, pipe) ((pipe == 1)? &udc->eps[0]: \ &udc->eps[pipe])