From 2f30afb8989938d15d91d5b04c71bfb7d4b88020 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Sat, 4 Feb 2012 18:55:26 +0100 Subject: [PATCH] --- yaml --- r: 303801 b: refs/heads/master c: 504d14c4657e920927178fcb8d070f55f5d4eb66 h: refs/heads/master i: 303799: f9672ba4e4a47ce9bf9ece50d1ba63ba1955dff0 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/fsl_qe_udc.c | 42 --------------------------- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/[refs] b/[refs] index 49dd772cae56..1cac14faf493 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d77c1198666d87a9b21e9594ca29ac7e42011623 +refs/heads/master: 504d14c4657e920927178fcb8d070f55f5d4eb66 diff --git a/trunk/drivers/usb/gadget/fsl_qe_udc.c b/trunk/drivers/usb/gadget/fsl_qe_udc.c index aae6e98594c9..51881f3bd07a 100644 --- a/trunk/drivers/usb/gadget/fsl_qe_udc.c +++ b/trunk/drivers/usb/gadget/fsl_qe_udc.c @@ -1888,43 +1888,6 @@ static int qe_get_frame(struct usb_gadget *gadget) return (int)tmp; } -/* Tries to wake up the host connected to this gadget - * - * Return : 0-success - * Negative-this feature not enabled by host or not supported by device hw - */ -static int qe_wakeup(struct usb_gadget *gadget) -{ - return -ENOTSUPP; -} - -/* Notify controller that VBUS is powered, Called by whatever - detects VBUS sessions */ -static int qe_vbus_session(struct usb_gadget *gadget, int is_active) -{ - return -ENOTSUPP; -} - -/* constrain controller's VBUS power usage - * This call is used by gadget drivers during SET_CONFIGURATION calls, - * reporting how much power the device may consume. For example, this - * could affect how quickly batteries are recharged. - * - * Returns zero on success, else negative errno. - */ -static int qe_vbus_draw(struct usb_gadget *gadget, unsigned mA) -{ - return -ENOTSUPP; -} - -/* Change Data+ pullup status - * this func is used by usb_gadget_connect/disconnect - */ -static int qe_pullup(struct usb_gadget *gadget, int is_on) -{ - return -ENOTSUPP; -} - static int fsl_qe_start(struct usb_gadget *gadget, struct usb_gadget_driver *driver); static int fsl_qe_stop(struct usb_gadget *gadget, @@ -1933,11 +1896,6 @@ static int fsl_qe_stop(struct usb_gadget *gadget, /* defined in usb_gadget.h */ static struct usb_gadget_ops qe_gadget_ops = { .get_frame = qe_get_frame, - .wakeup = qe_wakeup, -/* .set_selfpowered = qe_set_selfpowered,*/ /* always selfpowered */ - .vbus_session = qe_vbus_session, - .vbus_draw = qe_vbus_draw, - .pullup = qe_pullup, .udc_start = fsl_qe_start, .udc_stop = fsl_qe_stop, };