summaryrefslogtreecommitdiff
path: root/drivers/staging/ccg
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2012-09-07 07:53:17 (GMT)
committerFelipe Balbi <balbi@ti.com>2012-09-10 12:35:41 (GMT)
commitffe0b335062505a98d7296dae2c2a197713f87e0 (patch)
treec2fe75a9711026ee65409034dd71579bad64a801 /drivers/staging/ccg
parente220ff75db3c1195814c2ad5ada11f71b011d000 (diff)
downloadlinux-fsl-qoriq-ffe0b335062505a98d7296dae2c2a197713f87e0.tar.xz
usb: gadget: remove global variable composite in composite.c
This patch removes the global variable composite in composite.c. The private data which was saved there is now passed via an additional argument to the bind() function in struct usb_gadget_driver. Only the "old-style" UDC drivers have to be touched here, new style are doing it right because this change is made in udc-core. Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/staging/ccg')
-rw-r--r--drivers/staging/ccg/composite.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/ccg/composite.c b/drivers/staging/ccg/composite.c
index 2a345f2..228b457 100644
--- a/drivers/staging/ccg/composite.c
+++ b/drivers/staging/ccg/composite.c
@@ -1422,7 +1422,8 @@ static u8 override_id(struct usb_composite_dev *cdev, u8 *desc)
return *desc;
}
-static int composite_bind(struct usb_gadget *gadget)
+static int composite_bind(struct usb_gadget *gadget,
+ struct usb_gadget_driver *driver)
{
struct usb_composite_dev *cdev;
int status = -ENOMEM;