From 39ce31c489318df415807ecbb0b8974c55728a91 Mon Sep 17 00:00:00 2001 From: Michal Nazarewicz Date: Tue, 6 Nov 2012 22:52:40 +0100 Subject: [PATCH] --- yaml --- r: 338647 b: refs/heads/master c: be44f1c80b998b00cfa1759f4ba88f6497810963 h: refs/heads/master i: 338645: de9950bc33cb59a9cf6159fedebd57401b9bc56e 338643: c21d7a1f10cb3b61e189daa237ccdaadf6e2fffc 338639: 46e8c2ba0f9cd1ed7cf7280b8353df250d5c3cd8 v: v3 --- [refs] | 2 +- trunk/drivers/usb/chipidea/debug.c | 3 --- trunk/drivers/usb/gadget/udc-core.c | 11 ----------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 24ccf5dfb615..c356331ccf1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fea20dbcfd6673d73d510984589897bd921c8a1d +refs/heads/master: be44f1c80b998b00cfa1759f4ba88f6497810963 diff --git a/trunk/drivers/usb/chipidea/debug.c b/trunk/drivers/usb/chipidea/debug.c index c6f50a257565..3bc244d2636a 100644 --- a/trunk/drivers/usb/chipidea/debug.c +++ b/trunk/drivers/usb/chipidea/debug.c @@ -160,9 +160,6 @@ static ssize_t show_device(struct device *dev, struct device_attribute *attr, gadget->speed); n += scnprintf(buf + n, PAGE_SIZE - n, "max_speed = %d\n", gadget->max_speed); - /* TODO: Scheduled for removal in 3.8. */ - n += scnprintf(buf + n, PAGE_SIZE - n, "is_dualspeed = %d\n", - gadget_is_dualspeed(gadget)); n += scnprintf(buf + n, PAGE_SIZE - n, "is_otg = %d\n", gadget->is_otg); n += scnprintf(buf + n, PAGE_SIZE - n, "is_a_peripheral = %d\n", diff --git a/trunk/drivers/usb/gadget/udc-core.c b/trunk/drivers/usb/gadget/udc-core.c index f3cd9690b101..4d90a800063c 100644 --- a/trunk/drivers/usb/gadget/udc-core.c +++ b/trunk/drivers/usb/gadget/udc-core.c @@ -439,16 +439,6 @@ static DEVICE_ATTR(name, S_IRUSR, usb_udc_##param##_show, NULL) static USB_UDC_SPEED_ATTR(current_speed, speed); static USB_UDC_SPEED_ATTR(maximum_speed, max_speed); -/* TODO: Scheduled for removal in 3.8. */ -static ssize_t usb_udc_is_dualspeed_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct usb_udc *udc = container_of(dev, struct usb_udc, dev); - return snprintf(buf, PAGE_SIZE, "%d\n", - gadget_is_dualspeed(udc->gadget)); -} -static DEVICE_ATTR(is_dualspeed, S_IRUSR, usb_udc_is_dualspeed_show, NULL); - #define USB_UDC_ATTR(name) \ ssize_t usb_udc_##name##_show(struct device *dev, \ struct device_attribute *attr, char *buf) \ @@ -472,7 +462,6 @@ static struct attribute *usb_udc_attrs[] = { &dev_attr_current_speed.attr, &dev_attr_maximum_speed.attr, - &dev_attr_is_dualspeed.attr, &dev_attr_is_otg.attr, &dev_attr_is_a_peripheral.attr, &dev_attr_b_hnp_enable.attr,