From patchwork Sun Jun 10 20:15:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Collins X-Patchwork-Id: 164967 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 4538C1007D1 for ; Fri, 15 Jun 2012 03:10:39 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SfDZ1-00038X-0q; Thu, 14 Jun 2012 17:10:31 +0000 Received: from mail-pz0-f49.google.com ([209.85.210.49]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SfDYy-0002fM-UQ for kernel-team@lists.ubuntu.com; Thu, 14 Jun 2012 17:10:29 +0000 Received: by mail-pz0-f49.google.com with SMTP id m1so2942909dad.8 for ; Thu, 14 Jun 2012 10:10:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:in-reply-to:references:from:date:subject:to; bh=Zr1ccsMRAyuVghUMKTHxwxMVOXw/FhIk4AMl9oC6v44=; b=in4prZVsJ1c6e7Iiv3ZePlEzXWw/lY2hfrkHKi2v9EeSFdimcFpjmCVISLjBHfuLFl pvG5dYjmPc49s6zuCVcXpaJPTI5MLemBSOBA2QcEVYeqBElfYgcUtR5aPjcAS5fCmVqQ 2Rvf2Mc+qoINcDn3cEyFYfTAZycb7rRna7h4d6Bv1d4dCE4uP5OTNo7O0kcSyinj8gKJ kjxhmyY+RkjejssBVy4HbjBavffaLbo98HYGDNYpFugBqlMu9wuODpL5qyeZ70/RF07x ZOR2xemzm1sWdiQCCyhLMGNh8Ua3dwJIXcCiqoDsk2UZmkAUQgUMH9BAC85ShzB8M8PX Lrbw== Received: by 10.68.231.8 with SMTP id tc8mr9901962pbc.140.1339693828362; Thu, 14 Jun 2012 10:10:28 -0700 (PDT) Received: from localhost (ip68-13-200-36.hr.hr.cox.net. [68.13.200.36]) by mx.google.com with ESMTPS id qn1sm10109423pbc.9.2012.06.14.10.10.25 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jun 2012 10:10:27 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Thu, 14 Jun 2012 13:10:21 -0400 Message-Id: In-Reply-To: References: From: Ben Collins Date: Sun, 10 Jun 2012 16:15:17 -0400 Subject: [PATCH 2/6] UBUNTU: [Upstream] Complete fsl qe/udc driver conversion To: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Two commits: - 79149b8bd0270a268344300a77a2dd3f51039f14 - ec39e2aeeff2901ef1b1d8ea09533e4b86ad89bb Did not completely convert the fsl gadget drivers to use the desc in usb_ep as described in commit messages. Fix the macros that were still referencing the old pointer. (Patch accepted upstream) Signed-off-by: Ben Collins --- drivers/usb/gadget/fsl_qe_udc.h | 4 ++-- drivers/usb/gadget/fsl_udc_core.c | 2 +- drivers/usb/gadget/fsl_usb2_udc.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/usb/gadget/fsl_qe_udc.h b/drivers/usb/gadget/fsl_qe_udc.h index 4c07ca9..7026919 100644 --- a/drivers/usb/gadget/fsl_qe_udc.h +++ b/drivers/usb/gadget/fsl_qe_udc.h @@ -153,10 +153,10 @@ struct usb_ep_para{ #define USB_BUSMODE_DTB 0x02 /* Endpoint basic handle */ -#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) /* ep0 transfer state */ 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..d6f9902 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])