diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c index 0acf8efb10e6..843e78c9e374 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -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); diff --git a/drivers/usb/gadget/function/u_uvc.h b/drivers/usb/gadget/function/u_uvc.h index d50630ce4bc7..fea15c9cbf73 100644 --- a/drivers/usb/gadget/function/u_uvc.h +++ b/drivers/usb/gadget/function/u_uvc.h @@ -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 diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c index f1dcb2860a05..82fa8c6bee3e 100644 --- a/drivers/usb/gadget/function/uvc_configfs.c +++ b/drivers/usb/gadget/function/uvc_configfs.c @@ -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,