Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be44f1c8 authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Felipe Balbi
Browse files

usb: gadget: Remove reference to is_dualspeed from sysfs. 



This commit removes the /sys/devices/platform/<UDC>/udc/<UDC>/is_dualspeed
file and is_dualspeeed line from /sys/devices/platform/ci13xxx_*/udc/device
file.

The is_dualspeed file is superseded by maximum_speed in the same directory
and is_dualspeed line in device file is superseded by max_speed line in
the same file.

The maximum_speed/max_speed specifies maximum speed supported by UDC.
To check if dualspeeed is supported, check if the value is >= 3.

Signed-off-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent fea20dbc

drivers/usb/chipidea/debug.c

+0 −3
Original line number Diff line number Diff line
@@ -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",

drivers/usb/gadget/udc-core.c

+0 −11
Original line number Diff line number Diff line
@@ -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,