diff options
author | Amber Thrall <amber.rose.thrall@gmail.com> | 2014-09-20 00:03:15 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-09-23 15:13:44 -0400 |
commit | 146af9cb809c6b6a0f4e215570fb3f397cd55a21 (patch) | |
tree | 28a0d77060212be8cd1d4460139f02ab38094b24 /drivers/media/usb/usbtv | |
parent | e87cb470896e9089d2185e1dcbe8d17b0e3361d3 (diff) |
[media] Media: USB: usbtv: Fixed all coding style issues in usbtv source files
Fixed various coding styles, ignoring coding style error on line 5 for all files containing a link that is longer than 80 characters long.
Signed-off-by: Amber Thrall <amber.rose.thrall@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/usbtv')
-rw-r--r-- | drivers/media/usb/usbtv/usbtv-audio.c | 1 | ||||
-rw-r--r-- | drivers/media/usb/usbtv/usbtv-core.c | 1 | ||||
-rw-r--r-- | drivers/media/usb/usbtv/usbtv-video.c | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/usb/usbtv/usbtv-audio.c b/drivers/media/usb/usbtv/usbtv-audio.c index 2d8795f683bf..78c12d22dfbb 100644 --- a/drivers/media/usb/usbtv/usbtv-audio.c +++ b/drivers/media/usb/usbtv/usbtv-audio.c | |||
@@ -311,6 +311,7 @@ static int snd_usbtv_card_trigger(struct snd_pcm_substream *substream, int cmd) | |||
311 | static snd_pcm_uframes_t snd_usbtv_pointer(struct snd_pcm_substream *substream) | 311 | static snd_pcm_uframes_t snd_usbtv_pointer(struct snd_pcm_substream *substream) |
312 | { | 312 | { |
313 | struct usbtv *chip = snd_pcm_substream_chip(substream); | 313 | struct usbtv *chip = snd_pcm_substream_chip(substream); |
314 | |||
314 | return chip->snd_buffer_pos; | 315 | return chip->snd_buffer_pos; |
315 | } | 316 | } |
316 | 317 | ||
diff --git a/drivers/media/usb/usbtv/usbtv-core.c b/drivers/media/usb/usbtv/usbtv-core.c index bf25ecf143a2..29428bef272c 100644 --- a/drivers/media/usb/usbtv/usbtv-core.c +++ b/drivers/media/usb/usbtv/usbtv-core.c | |||
@@ -108,6 +108,7 @@ usbtv_video_fail: | |||
108 | static void usbtv_disconnect(struct usb_interface *intf) | 108 | static void usbtv_disconnect(struct usb_interface *intf) |
109 | { | 109 | { |
110 | struct usbtv *usbtv = usb_get_intfdata(intf); | 110 | struct usbtv *usbtv = usb_get_intfdata(intf); |
111 | |||
111 | usb_set_intfdata(intf, NULL); | 112 | usb_set_intfdata(intf, NULL); |
112 | 113 | ||
113 | if (!usbtv) | 114 | if (!usbtv) |
diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c index 3d6ed1f7509e..9d3525f659f0 100644 --- a/drivers/media/usb/usbtv/usbtv-video.c +++ b/drivers/media/usb/usbtv/usbtv-video.c | |||
@@ -263,6 +263,7 @@ static void usbtv_chunk_to_vbuf(u32 *frame, __be32 *src, int chunk_no, int odd) | |||
263 | int part_index = (line * 2 + !odd) * 3 + (part_no % 3); | 263 | int part_index = (line * 2 + !odd) * 3 + (part_no % 3); |
264 | 264 | ||
265 | u32 *dst = &frame[part_index * USBTV_CHUNK/2]; | 265 | u32 *dst = &frame[part_index * USBTV_CHUNK/2]; |
266 | |||
266 | memcpy(dst, src, USBTV_CHUNK/2 * sizeof(*src)); | 267 | memcpy(dst, src, USBTV_CHUNK/2 * sizeof(*src)); |
267 | src += USBTV_CHUNK/2; | 268 | src += USBTV_CHUNK/2; |
268 | } | 269 | } |
@@ -407,6 +408,7 @@ static void usbtv_stop(struct usbtv *usbtv) | |||
407 | /* Cancel running transfers. */ | 408 | /* Cancel running transfers. */ |
408 | for (i = 0; i < USBTV_ISOC_TRANSFERS; i++) { | 409 | for (i = 0; i < USBTV_ISOC_TRANSFERS; i++) { |
409 | struct urb *ip = usbtv->isoc_urbs[i]; | 410 | struct urb *ip = usbtv->isoc_urbs[i]; |
411 | |||
410 | if (ip == NULL) | 412 | if (ip == NULL) |
411 | continue; | 413 | continue; |
412 | usb_kill_urb(ip); | 414 | usb_kill_urb(ip); |
@@ -560,6 +562,7 @@ static int usbtv_g_input(struct file *file, void *priv, unsigned int *i) | |||
560 | static int usbtv_s_input(struct file *file, void *priv, unsigned int i) | 562 | static int usbtv_s_input(struct file *file, void *priv, unsigned int i) |
561 | { | 563 | { |
562 | struct usbtv *usbtv = video_drvdata(file); | 564 | struct usbtv *usbtv = video_drvdata(file); |
565 | |||
563 | return usbtv_select_input(usbtv, i); | 566 | return usbtv_select_input(usbtv, i); |
564 | } | 567 | } |
565 | 568 | ||