shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "usb: gadget: uvc: add a new attribute streaming_intf"

Browse Source 
This reverts commit 017ed08206.

Change-Id: Ic99fd44da907292ca2f6328e6dff7933b9bed50d
Signed-off-by: William Wu <william.wu@rock-chips.com>
This commit is contained in:
William Wu
2020-04-07 10:45:33 +08:00
committed by Tao Huang
parent 0737cbbd0b
commit 04a5983be7
3 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/usb/gadget/function/f_uvc.c
View File

@@ -913,7 +913,6 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
}
uvc->streaming_intf = ret;
opts->streaming_intf = ret;
/* Copy descriptors */
f->fs_descriptors = uvc_copy_descriptors(uvc, USB_SPEED_FULL);

1
drivers/usb/gadget/function/u_uvc.h
View File

@@ -26,7 +26,6 @@ struct f_uvc_opts {
unsigned int streaming_interval;
unsigned int streaming_maxpacket;
unsigned int streaming_maxburst;
unsigned int streaming_intf;
/*
* Control descriptors array pointers for full-/high-speed and

11
drivers/usb/gadget/function/uvc_configfs.c
View File

@@ -2200,20 +2200,9 @@ UVCG_OPTS_ATTR(streaming_maxburst, streaming_maxburst, identity_conv,
#undef UVCG_OPTS_ATTR
static ssize_t f_uvc_opts_streaming_intf_show(struct config_item *item,
char *page)
{
struct f_uvc_opts *opts = to_f_uvc_opts(item);
return sprintf(page, "%d\n", opts->streaming_intf);
}
UVC_ATTR_RO(f_uvc_opts_, streaming_intf, streaming_intf);
static struct configfs_attribute *uvc_attrs[] = {
&f_uvc_opts_attr_streaming_bulk,
&f_uvc_opts_attr_streaming_interval,
&f_uvc_opts_attr_streaming_intf,
&f_uvc_opts_attr_streaming_maxpacket,
&f_uvc_opts_attr_streaming_maxburst,
NULL,