From aaaa27a02b13215adf12440de9a3ee373aea220c Mon Sep 17 00:00:00 2001 From: Alexander Shishkin Date: Fri, 11 May 2012 17:25:57 +0300 Subject: [PATCH] --- yaml --- r: 303920 b: refs/heads/master c: ab3999a26147e9c0d2949df751b86519065bf8bd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/chipidea/ci.h | 2 -- trunk/drivers/usb/chipidea/udc.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b231d3290bbf..b70bf02ae58a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e0aa49ec61e888d50727a7e80e87626f745c119 +refs/heads/master: ab3999a26147e9c0d2949df751b86519065bf8bd diff --git a/trunk/drivers/usb/chipidea/ci.h b/trunk/drivers/usb/chipidea/ci.h index 8a6872aae79f..50911f8490d4 100644 --- a/trunk/drivers/usb/chipidea/ci.h +++ b/trunk/drivers/usb/chipidea/ci.h @@ -38,7 +38,6 @@ * @wedge: is the endpoint wedged * @udc: pointer to the controller * @lock: pointer to controller's spinlock - * @device: pointer to gadget's struct device * @td_pool: pointer to controller's TD pool */ struct ci13xxx_ep { @@ -57,7 +56,6 @@ struct ci13xxx_ep { /* global resources */ struct ci13xxx *udc; spinlock_t *lock; - struct device *device; struct dma_pool *td_pool; }; diff --git a/trunk/drivers/usb/chipidea/udc.c b/trunk/drivers/usb/chipidea/udc.c index 09458d81f300..51f96942dc5e 100644 --- a/trunk/drivers/usb/chipidea/udc.c +++ b/trunk/drivers/usb/chipidea/udc.c @@ -1450,7 +1450,6 @@ static int init_eps(struct ci13xxx *udc) mEp->udc = udc; mEp->lock = &udc->lock; - mEp->device = &udc->gadget.dev; mEp->td_pool = udc->td_pool; mEp->ep.name = mEp->name;