Skip to content

L
linux
Commit cb9cd6c5 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files
Options

media: uvcvideo: Drop extern keyword in function declarations 

The extern keyword isn't needed to declare functions in header files.
Drop it.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 07b7d9fc
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 74 deletions
drivers/media/usb/uvc/uvcvideo.h
View file @ cb9cd6c5
...@@ -667,40 +667,38 @@ extern unsigned int uvc_hw_timestamps_param; ...@@ -667,40 +667,38 @@ extern unsigned int uvc_hw_timestamps_param;
/* Core driver */ /* Core driver */
extern struct uvc_driver uvc_driver; extern struct uvc_driver uvc_driver;
extern struct uvc_entity *uvc_entity_by_id(struct uvc_device *dev, int id); struct uvc_entity *uvc_entity_by_id(struct uvc_device *dev, int id);
/* Video buffers queue management. */ /* Video buffers queue management. */
extern int uvc_queue_init(struct uvc_video_queue *queue, int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
enum v4l2_buf_type type, int drop_corrupted); int drop_corrupted);
extern void uvc_queue_release(struct uvc_video_queue *queue); void uvc_queue_release(struct uvc_video_queue *queue);
extern int uvc_request_buffers(struct uvc_video_queue *queue, int uvc_request_buffers(struct uvc_video_queue *queue,
struct v4l2_requestbuffers *rb); struct v4l2_requestbuffers *rb);
extern int uvc_query_buffer(struct uvc_video_queue *queue, int uvc_query_buffer(struct uvc_video_queue *queue,
struct v4l2_buffer *v4l2_buf); struct v4l2_buffer *v4l2_buf);
extern int uvc_create_buffers(struct uvc_video_queue *queue, int uvc_create_buffers(struct uvc_video_queue *queue,
struct v4l2_create_buffers *v4l2_cb); struct v4l2_create_buffers *v4l2_cb);
extern int uvc_queue_buffer(struct uvc_video_queue *queue, int uvc_queue_buffer(struct uvc_video_queue *queue,
struct v4l2_buffer *v4l2_buf); struct v4l2_buffer *v4l2_buf);
extern int uvc_export_buffer(struct uvc_video_queue *queue, int uvc_export_buffer(struct uvc_video_queue *queue,
struct v4l2_exportbuffer *exp); struct v4l2_exportbuffer *exp);
extern int uvc_dequeue_buffer(struct uvc_video_queue *queue, int uvc_dequeue_buffer(struct uvc_video_queue *queue,
struct v4l2_buffer *v4l2_buf, int nonblocking); struct v4l2_buffer *v4l2_buf, int nonblocking);
extern int uvc_queue_streamon(struct uvc_video_queue *queue, int uvc_queue_streamon(struct uvc_video_queue *queue, enum v4l2_buf_type type);
enum v4l2_buf_type type); int uvc_queue_streamoff(struct uvc_video_queue *queue, enum v4l2_buf_type type);
extern int uvc_queue_streamoff(struct uvc_video_queue *queue, void uvc_queue_cancel(struct uvc_video_queue *queue, int disconnect);
enum v4l2_buf_type type); struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue,
extern void uvc_queue_cancel(struct uvc_video_queue *queue, int disconnect); struct uvc_buffer *buf);
extern struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue, int uvc_queue_mmap(struct uvc_video_queue *queue,
struct uvc_buffer *buf); struct vm_area_struct *vma);
extern int uvc_queue_mmap(struct uvc_video_queue *queue, __poll_t uvc_queue_poll(struct uvc_video_queue *queue, struct file *file,
struct vm_area_struct *vma); poll_table *wait);
extern __poll_t uvc_queue_poll(struct uvc_video_queue *queue,
struct file *file, poll_table *wait);
#ifndef CONFIG_MMU #ifndef CONFIG_MMU
extern unsigned long uvc_queue_get_unmapped_area(struct uvc_video_queue *queue, unsigned long uvc_queue_get_unmapped_area(struct uvc_video_queue *queue,
unsigned long pgoff); unsigned long pgoff);
#endif #endif
extern int uvc_queue_allocated(struct uvc_video_queue *queue); int uvc_queue_allocated(struct uvc_video_queue *queue);
static inline int uvc_queue_streaming(struct uvc_video_queue *queue) static inline int uvc_queue_streaming(struct uvc_video_queue *queue)
{ {
return vb2_is_streaming(&queue->queue); return vb2_is_streaming(&queue->queue);
...@@ -711,18 +709,18 @@ extern const struct v4l2_ioctl_ops uvc_ioctl_ops; ...@@ -711,18 +709,18 @@ extern const struct v4l2_ioctl_ops uvc_ioctl_ops;
extern const struct v4l2_file_operations uvc_fops; extern const struct v4l2_file_operations uvc_fops;
/* Media controller */ /* Media controller */
extern int uvc_mc_register_entities(struct uvc_video_chain *chain); int uvc_mc_register_entities(struct uvc_video_chain *chain);
extern void uvc_mc_cleanup_entity(struct uvc_entity *entity); void uvc_mc_cleanup_entity(struct uvc_entity *entity);
/* Video */ /* Video */
extern int uvc_video_init(struct uvc_streaming *stream); int uvc_video_init(struct uvc_streaming *stream);
extern int uvc_video_suspend(struct uvc_streaming *stream); int uvc_video_suspend(struct uvc_streaming *stream);
extern int uvc_video_resume(struct uvc_streaming *stream, int reset); int uvc_video_resume(struct uvc_streaming *stream, int reset);
extern int uvc_video_enable(struct uvc_streaming *stream, int enable); int uvc_video_enable(struct uvc_streaming *stream, int enable);
extern int uvc_probe_video(struct uvc_streaming *stream, int uvc_probe_video(struct uvc_streaming *stream,
struct uvc_streaming_control *probe); struct uvc_streaming_control *probe);
extern int uvc_query_ctrl(struct uvc_device *dev, __u8 query, __u8 unit, int uvc_query_ctrl(struct uvc_device *dev, __u8 query, __u8 unit,
__u8 intfnum, __u8 cs, void *data, __u16 size); __u8 intfnum, __u8 cs, void *data, __u16 size);
void uvc_video_clock_update(struct uvc_streaming *stream, void uvc_video_clock_update(struct uvc_streaming *stream,
struct vb2_v4l2_buffer *vbuf, struct vb2_v4l2_buffer *vbuf,
struct uvc_buffer *buf); struct uvc_buffer *buf);
...@@ -737,32 +735,32 @@ int uvc_register_video_device(struct uvc_device *dev, ...@@ -737,32 +735,32 @@ int uvc_register_video_device(struct uvc_device *dev,
const struct v4l2_ioctl_ops *ioctl_ops); const struct v4l2_ioctl_ops *ioctl_ops);
/* Status */ /* Status */
extern int uvc_status_init(struct uvc_device *dev); int uvc_status_init(struct uvc_device *dev);
extern void uvc_status_cleanup(struct uvc_device *dev); void uvc_status_cleanup(struct uvc_device *dev);
extern int uvc_status_start(struct uvc_device *dev, gfp_t flags); int uvc_status_start(struct uvc_device *dev, gfp_t flags);
extern void uvc_status_stop(struct uvc_device *dev); void uvc_status_stop(struct uvc_device *dev);
/* Controls */ /* Controls */
extern const struct v4l2_subscribed_event_ops uvc_ctrl_sub_ev_ops; extern const struct v4l2_subscribed_event_ops uvc_ctrl_sub_ev_ops;
extern int uvc_query_v4l2_ctrl(struct uvc_video_chain *chain, int uvc_query_v4l2_ctrl(struct uvc_video_chain *chain,
struct v4l2_queryctrl *v4l2_ctrl); struct v4l2_queryctrl *v4l2_ctrl);
extern int uvc_query_v4l2_menu(struct uvc_video_chain *chain, int uvc_query_v4l2_menu(struct uvc_video_chain *chain,
struct v4l2_querymenu *query_menu); struct v4l2_querymenu *query_menu);
extern int uvc_ctrl_add_mapping(struct uvc_video_chain *chain, int uvc_ctrl_add_mapping(struct uvc_video_chain *chain,
const struct uvc_control_mapping *mapping); const struct uvc_control_mapping *mapping);
extern int uvc_ctrl_init_device(struct uvc_device *dev); int uvc_ctrl_init_device(struct uvc_device *dev);
extern void uvc_ctrl_cleanup_device(struct uvc_device *dev); void uvc_ctrl_cleanup_device(struct uvc_device *dev);
extern int uvc_ctrl_restore_values(struct uvc_device *dev); int uvc_ctrl_restore_values(struct uvc_device *dev);
extern int uvc_ctrl_begin(struct uvc_video_chain *chain); int uvc_ctrl_begin(struct uvc_video_chain *chain);
extern int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback, int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback,
const struct v4l2_ext_control *xctrls, const struct v4l2_ext_control *xctrls,
unsigned int xctrls_count); unsigned int xctrls_count);
static inline int uvc_ctrl_commit(struct uvc_fh *handle, static inline int uvc_ctrl_commit(struct uvc_fh *handle,
const struct v4l2_ext_control *xctrls, const struct v4l2_ext_control *xctrls,
unsigned int xctrls_count) unsigned int xctrls_count)
{ {
return __uvc_ctrl_commit(handle, 0, xctrls, xctrls_count); return __uvc_ctrl_commit(handle, 0, xctrls, xctrls_count);
} }
...@@ -771,25 +769,23 @@ static inline int uvc_ctrl_rollback(struct uvc_fh *handle) ...@@ -771,25 +769,23 @@ static inline int uvc_ctrl_rollback(struct uvc_fh *handle)
return __uvc_ctrl_commit(handle, 1, NULL, 0); return __uvc_ctrl_commit(handle, 1, NULL, 0);
} }
extern int uvc_ctrl_get(struct uvc_video_chain *chain, int uvc_ctrl_get(struct uvc_video_chain *chain, struct v4l2_ext_control *xctrl);
struct v4l2_ext_control *xctrl); int uvc_ctrl_set(struct uvc_video_chain *chain, struct v4l2_ext_control *xctrl);
extern int uvc_ctrl_set(struct uvc_video_chain *chain,
struct v4l2_ext_control *xctrl);
extern int uvc_xu_ctrl_query(struct uvc_video_chain *chain, int uvc_xu_ctrl_query(struct uvc_video_chain *chain,
struct uvc_xu_control_query *xqry); struct uvc_xu_control_query *xqry);
/* Utility functions */ /* Utility functions */
extern void uvc_simplify_fraction(uint32_t *numerator, uint32_t *denominator, void uvc_simplify_fraction(uint32_t *numerator, uint32_t *denominator,
unsigned int n_terms, unsigned int threshold); unsigned int n_terms, unsigned int threshold);
extern uint32_t uvc_fraction_to_interval(uint32_t numerator, uint32_t uvc_fraction_to_interval(uint32_t numerator, uint32_t denominator);
uint32_t denominator); struct usb_host_endpoint *uvc_find_endpoint(struct usb_host_interface *alts,
extern struct usb_host_endpoint *uvc_find_endpoint( __u8 epaddr);
struct usb_host_interface *alts, __u8 epaddr);
/* Quirks support */ /* Quirks support */
void uvc_video_decode_isight(struct urb *urb, struct uvc_streaming *stream, void uvc_video_decode_isight(struct urb *urb, struct uvc_streaming *stream,
struct uvc_buffer *buf, struct uvc_buffer *meta_buf); struct uvc_buffer *buf,
struct uvc_buffer *meta_buf);
/* debugfs and statistics */ /* debugfs and statistics */
void uvc_debugfs_init(void); void uvc_debugfs_init(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7