tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

media: uvcvideo: Remove nodrop parameter

We announced the deprecation intentions one year ago in the commit
commit 40ed9e9b2808 ("media: uvcvideo: Announce the user our deprecation
intentions").

We have not hear any complains, lets remove the nodrop parameter.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Reviewed-by: Hans de Goede <johannes.goede@oss.qualcomm.com>
Signed-off-by: Hans de Goede <johannes.goede@oss.qualcomm.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

authored by

Ricardo Ribalda and committed by
Hans Verkuil 27ccc44a f0487a90

-45
-19
drivers/media/usb/uvc/uvc_driver.c
··· 32 32 33 33 unsigned int uvc_clock_param = CLOCK_MONOTONIC; 34 34 unsigned int uvc_hw_timestamps_param; 35 - unsigned int uvc_no_drop_param = 1; 36 35 static unsigned int uvc_quirks_param = -1; 37 36 unsigned int uvc_dbg_param; 38 37 unsigned int uvc_timeout_param = UVC_CTRL_STREAMING_TIMEOUT; ··· 2466 2467 MODULE_PARM_DESC(clock, "Video buffers timestamp clock"); 2467 2468 module_param_named(hwtimestamps, uvc_hw_timestamps_param, uint, 0644); 2468 2469 MODULE_PARM_DESC(hwtimestamps, "Use hardware timestamps"); 2469 - 2470 - static int param_set_nodrop(const char *val, const struct kernel_param *kp) 2471 - { 2472 - pr_warn_once("uvcvideo: " 2473 - DEPRECATED 2474 - "nodrop parameter will be eventually removed.\n"); 2475 - return param_set_bool(val, kp); 2476 - } 2477 - 2478 - static const struct kernel_param_ops param_ops_nodrop = { 2479 - .set = param_set_nodrop, 2480 - .get = param_get_uint, 2481 - }; 2482 - 2483 - param_check_uint(nodrop, &uvc_no_drop_param); 2484 - module_param_cb(nodrop, &param_ops_nodrop, &uvc_no_drop_param, 0644); 2485 - __MODULE_PARM_TYPE(nodrop, "uint"); 2486 - MODULE_PARM_DESC(nodrop, "Don't drop incomplete frames"); 2487 2470 2488 2471 module_param_named(quirks, uvc_quirks_param, uint, 0644); 2489 2472 MODULE_PARM_DESC(quirks, "Forced device quirks");
-25
drivers/media/usb/uvc/uvc_queue.c
··· 331 331 return nextbuf; 332 332 } 333 333 334 - /* 335 - * uvc_queue_buffer_requeue: Requeue a buffer on our internal irqqueue 336 - * 337 - * Reuse a buffer through our internal queue without the need to 'prepare'. 338 - * The buffer will be returned to userspace through the uvc_buffer_queue call if 339 - * the device has been disconnected. 340 - */ 341 - static void uvc_queue_buffer_requeue(struct uvc_video_queue *queue, 342 - struct uvc_buffer *buf) 343 - { 344 - buf->error = 0; 345 - buf->state = UVC_BUF_STATE_QUEUED; 346 - buf->bytesused = 0; 347 - vb2_set_plane_payload(&buf->buf.vb2_buf, 0, 0); 348 - 349 - uvc_buffer_queue(&buf->buf.vb2_buf); 350 - } 351 - 352 334 static void uvc_queue_buffer_complete(struct kref *ref) 353 335 { 354 336 struct uvc_buffer *buf = container_of(ref, struct uvc_buffer, ref); 355 - struct vb2_buffer *vb = &buf->buf.vb2_buf; 356 - struct uvc_video_queue *queue = vb2_get_drv_priv(vb->vb2_queue); 357 - 358 - if (buf->error && !uvc_no_drop_param) { 359 - uvc_queue_buffer_requeue(queue, buf); 360 - return; 361 - } 362 337 363 338 buf->state = buf->error ? UVC_BUF_STATE_ERROR : UVC_BUF_STATE_DONE; 364 339 vb2_set_plane_payload(&buf->buf.vb2_buf, 0, buf->bytesused);
-1
drivers/media/usb/uvc/uvcvideo.h
··· 659 659 #define UVC_WARN_XU_GET_RES 2 660 660 661 661 extern unsigned int uvc_clock_param; 662 - extern unsigned int uvc_no_drop_param; 663 662 extern unsigned int uvc_dbg_param; 664 663 extern unsigned int uvc_timeout_param; 665 664 extern unsigned int uvc_hw_timestamps_param;