diff options
author | Aybuke Ozdemir <aybuke.147@gmail.com> | 2014-03-15 19:10:16 +0200 |
---|---|---|
committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:55:06 +0900 |
commit | 7b04f96a36612fdcc54dc227b451a39601b67438 (patch) | |
tree | ad5423fa1396ce3e296b1fcb3c6066f8bb525708 /drivers/staging | |
parent | c05232cfa8f638b38ab0426b8707fba84c1f4cb8 (diff) | |
download | linux-3.10-7b04f96a36612fdcc54dc227b451a39601b67438.tar.gz linux-3.10-7b04f96a36612fdcc54dc227b451a39601b67438.tar.bz2 linux-3.10-7b04f96a36612fdcc54dc227b451a39601b67438.zip |
upstream: staging: go7007: go7007-v4l2.c Fix line over 80 characters.
Fix checkpatch.pl issues with line over
80 characters in go7007-v4l2.c
Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/media/go7007/go7007-v4l2.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/drivers/staging/media/go7007/go7007-v4l2.c b/drivers/staging/media/go7007/go7007-v4l2.c index 1eea4eb3b70..aed5ca8f2a9 100644 --- a/drivers/staging/media/go7007/go7007-v4l2.c +++ b/drivers/staging/media/go7007/go7007-v4l2.c @@ -434,7 +434,8 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, return set_capture_size(go, fmt, 0); } -static int go7007_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt, +static int go7007_queue_setup(struct vb2_queue *q, + const struct v4l2_format *fmt, unsigned int *num_buffers, unsigned int *num_planes, unsigned int sizes[], void *alloc_ctxs[]) { @@ -737,7 +738,8 @@ static int vidioc_enumaudio(struct file *file, void *fh, struct v4l2_audio *a) if (a->index >= go->board_info->num_aud_inputs) return -EINVAL; - strlcpy(a->name, go->board_info->aud_inputs[a->index].name, sizeof(a->name)); + strlcpy(a->name, go->board_info->aud_inputs[a->index].name, + sizeof(a->name)); a->capability = V4L2_AUDCAP_STEREO; return 0; } @@ -747,12 +749,14 @@ static int vidioc_g_audio(struct file *file, void *fh, struct v4l2_audio *a) struct go7007 *go = video_drvdata(file); a->index = go->aud_input; - strlcpy(a->name, go->board_info->aud_inputs[go->aud_input].name, sizeof(a->name)); + strlcpy(a->name, go->board_info->aud_inputs[go->aud_input].name, + sizeof(a->name)); a->capability = V4L2_AUDCAP_STEREO; return 0; } -static int vidioc_s_audio(struct file *file, void *fh, const struct v4l2_audio *a) +static int vidioc_s_audio(struct file *file, void *fh, + const struct v4l2_audio *a) { struct go7007 *go = video_drvdata(file); @@ -760,7 +764,7 @@ static int vidioc_s_audio(struct file *file, void *fh, const struct v4l2_audio * return -EINVAL; go->aud_input = a->index; v4l2_subdev_call(go->sd_audio, audio, s_routing, - go->board_info->aud_inputs[go->aud_input].audio_input, 0, 0); + go->board_info->aud_inputs[go->aud_input].audio_input, 0, 0); return 0; } @@ -960,8 +964,10 @@ int go7007_v4l2_ctrl_init(struct go7007 *go) V4L2_MPEG_VIDEO_ASPECT_1x1); ctrl = v4l2_ctrl_new_std(hdl, NULL, V4L2_CID_JPEG_ACTIVE_MARKER, 0, - V4L2_JPEG_ACTIVE_MARKER_DQT | V4L2_JPEG_ACTIVE_MARKER_DHT, 0, - V4L2_JPEG_ACTIVE_MARKER_DQT | V4L2_JPEG_ACTIVE_MARKER_DHT); + V4L2_JPEG_ACTIVE_MARKER_DQT | + V4L2_JPEG_ACTIVE_MARKER_DHT, 0, + V4L2_JPEG_ACTIVE_MARKER_DQT | + V4L2_JPEG_ACTIVE_MARKER_DHT); if (ctrl) ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY; if (hdl->error) { |