From 17dcac20f123be7934d2fa46cfa59dfb9999ebca Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Fri, 7 Oct 2011 13:57:42 -0700 Subject: [PATCH] --- yaml --- r: 265067 b: refs/heads/master c: 56526c0b8d752bf243a21722455807518925685f h: refs/heads/master i: 265065: f7c229275e7345cd145e5d290922994ad6fd2101 265063: 082d45bff3bf1a3e7f03177a1923b7acaec9441b v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/langwell_udc.c | 28 ++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 30c6501cfa1b..af0c5ab58b47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8a56e17e18cca2402b390c10b8d7f3cd0f6265b +refs/heads/master: 56526c0b8d752bf243a21722455807518925685f diff --git a/trunk/drivers/usb/gadget/langwell_udc.c b/trunk/drivers/usb/gadget/langwell_udc.c index c88158f307a8..cb728d3079af 100644 --- a/trunk/drivers/usb/gadget/langwell_udc.c +++ b/trunk/drivers/usb/gadget/langwell_udc.c @@ -1562,6 +1562,20 @@ static ssize_t show_function(struct device *_dev, static DEVICE_ATTR(function, S_IRUGO, show_function, NULL); +static inline enum usb_device_speed lpm_device_speed(u32 reg) +{ + switch (LPM_PSPD(reg)) { + case LPM_SPEED_HIGH: + return USB_SPEED_HIGH; + case LPM_SPEED_FULL: + return USB_SPEED_FULL; + case LPM_SPEED_LOW: + return USB_SPEED_LOW; + default: + return USB_SPEED_UNKNOWN; + } +} + /* device "langwell_udc" sysfs attribute file */ static ssize_t show_langwell_udc(struct device *_dev, struct device_attribute *attr, char *buf) @@ -2634,20 +2648,6 @@ static void handle_trans_complete(struct langwell_udc *dev) dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__); } -static inline enum usb_device_speed lpm_device_speed(u32 reg) -{ - switch (LPM_PSPD(reg)) { - case LPM_SPEED_HIGH: - return USB_SPEED_HIGH; - case LPM_SPEED_FULL: - return USB_SPEED_FULL; - case LPM_SPEED_LOW: - return USB_SPEED_LOW; - default: - return USB_SPEED_UNKNOWN; - } -} - /* port change detect interrupt handler */ static void handle_port_change(struct langwell_udc *dev) {