From: Christoph Fritz <chf.fritz@googlemail.com>
To: balbi@ti.com
Cc: Ben Dooks <ben-linux@fluff.org>,
Chen Peter-B29397 <B29397@freescale.com>,
Nicolas Ferre <nicolas.ferre@atmel.com>,
"Hans J. Koch" <hjk@hansjkoch.de>,
Fabio Estevam <festevam@gmail.com>,
Kukjin Kim <kgene.kim@samsung.com>,
Russell King <linux@arm.linux.org.uk>,
Thomas Dahlmann <dahlmann.thomas@arcor.de>,
Sascha Hauer <s.hauer@pengutronix.de>,
Christian Hemp <c.hemp@phytec.de>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Daniel Mack <daniel@caiaq.de>, Neil Zhang <zhangwm@marvell.com>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
Oliver Neukum <oneukum@suse.de>,
Eric Miao <eric.y.miao@gmail.com>,
Li Yang-R58472 <r58472@freescale.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
Ido Shayevitz <idos@codeaurora.org>,
Estevam Fabio-R49496 <r49496@freescale.com>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
Subject: [PATCH] usb: gadget: regression fix - useage of usb_ep
Date: Mon, 04 Jun 2012 17:24:03 +0200 [thread overview]
Message-ID: <1338823443.2979.3.camel@mars> (raw)
In-Reply-To: <20120604145917.GM8002@arwen.pp.htv.fi>
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 <chf.fritz@googlemail.com>
---
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])
--
1.7.2.5
next prev parent reply other threads:[~2012-06-04 15:24 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1333796272.3450.92.camel@lovely>
[not found] ` <F281D0F91ED19E4D8E63A7504E8A64980AFFE3@039-SN2MPN1-022.039d.mgd.msft.net>
[not found] ` <CAOMZO5AjQsNw7_4ETkB38mmuBXj4pnCwJwAsi4zC4b_83=Enfw@mail.gmail.com>
[not found] ` <20120409200656.GD2640@local>
[not found] ` <CAOMZO5BTrA8G6wwQZ3e6bydJX7UtG7jj2c29Ln7u_3_jyUGB+w@mail.gmail.com>
[not found] ` <20120410001017.GF2640@local>
[not found] ` <CAOMZO5A=sHeyoQ0PCd=09qGGKb0NjXi-kF5qyG+3U-GhD7rhzg@mail.gmail.com>
[not found] ` <20120410021151.GB23044@lovely.krouter>
[not found] ` <20120411073918.GA9180@lovely.krouter>
[not found] ` <CAOMZO5C729Ki0Bequ+s1nnrgt4NZWvwg3Wnjk4kHp=d9BtkeXw@mail.gmail.com>
2012-05-09 0:02 ` [RFC] [PATCH] usb: gadget: fix dtd dma confusion Christoph Fritz
2012-05-09 1:50 ` Neil Zhang
2012-05-09 2:11 ` Chen Peter-B29397
2012-05-09 5:38 ` Christoph Fritz
2012-05-09 5:43 ` Chen Peter-B29397
2012-05-09 5:56 ` Christoph Fritz
2012-05-09 5:45 ` Neil Zhang
2012-05-09 6:04 ` Christoph Fritz
2012-05-13 22:51 ` Christoph Fritz
2012-05-14 1:11 ` Chen Peter-B29397
2012-05-14 4:21 ` Greg Kroah-Hartman
2012-05-20 23:17 ` [PATCH] usb: fsl_udc: errata - postpone freeing current dTD Christoph Fritz
2012-05-21 1:05 ` Chen Peter-B29397
2012-05-21 6:53 ` Christoph Fritz
2012-05-21 6:57 ` [PATCH v2] " Christoph Fritz
2012-05-21 7:25 ` Chen Peter-B29397
2012-05-21 19:04 ` Felipe Balbi
2012-06-04 11:30 ` Christoph Fritz
2012-06-04 11:37 ` Christoph Fritz
2012-06-10 18:41 ` Fabio Estevam
2012-06-12 19:40 ` Christoph Fritz
2012-06-13 1:17 ` Fabio Estevam
2012-06-04 14:59 ` Felipe Balbi
2012-06-04 15:24 ` Christoph Fritz [this message]
2012-10-19 10:22 ` [PATCH 0/7] update USB gadget driver fsl-usb2-udc Christoph Fritz
2012-10-19 10:24 ` [PATCH 1/7] usb: gadget: fsl_udc: simplify driver init Christoph Fritz
2012-10-19 10:24 ` Felipe Balbi
2012-10-19 10:24 ` [PATCH 2/7] usb: gadget: fsl_udc: protect fsl_pullup() with spin_lock Christoph Fritz
2012-10-19 10:25 ` Felipe Balbi
2012-10-19 10:24 ` [PATCH 3/7] usb: gadget: fsl_udc: convert to new ulc style Christoph Fritz
2012-10-19 10:27 ` Felipe Balbi
2012-10-19 10:24 ` [PATCH 4/7] usb: gadget: fsl_udc: drop ARCH dependency Christoph Fritz
2012-10-19 10:29 ` Felipe Balbi
2012-10-19 10:24 ` [PATCH 5/7] usb: gadget: fsl_udc: postpone freeing current dTD Christoph Fritz
2012-10-19 10:30 ` Felipe Balbi
2012-10-19 10:46 ` Christoph Fritz
2012-10-19 10:44 ` Felipe Balbi
2012-10-20 19:12 ` Christoph Fritz
2012-10-22 7:54 ` Felipe Balbi
2012-10-19 10:24 ` [PATCH 6/7] usb: gadget: fsl_udc: purge global pointer usb_sys_regs Christoph Fritz
2012-10-19 10:24 ` [PATCH 7/7] usb: gadget: fsl_udc: purge global pointer dr_regs Christoph Fritz
2012-10-19 15:36 ` [PATCH 0/7] update USB gadget driver fsl-usb2-udc Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1338823443.2979.3.camel@mars \
--to=chf.fritz@googlemail.com \
--cc=B29397@freescale.com \
--cc=balbi@ti.com \
--cc=ben-linux@fluff.org \
--cc=c.hemp@phytec.de \
--cc=dahlmann.thomas@arcor.de \
--cc=daniel@caiaq.de \
--cc=eric.y.miao@gmail.com \
--cc=festevam@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=haojian.zhuang@gmail.com \
--cc=hjk@hansjkoch.de \
--cc=idos@codeaurora.org \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=nicolas.ferre@atmel.com \
--cc=oneukum@suse.de \
--cc=r49496@freescale.com \
--cc=r58472@freescale.com \
--cc=s.hauer@pengutronix.de \
--cc=zhangwm@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).