diff options
author | Sri Deevi <Srinivasa.Deevi@conexant.com> | 2009-03-04 15:49:01 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:44:03 -0400 |
commit | b9255176453086b2531c5559350bd5c92b771cc5 (patch) | |
tree | b448774588b137e6efb9fad0ce8902b00a8d4788 /drivers/media/video/cx231xx/cx231xx-video.c | |
parent | 818fdf341369110ff91296843797a9431a3d9b31 (diff) |
V4L/DVB (10957): cx231xx: Fix CodingStyle
Fixes several CodingStyle issues on the driver.
Signed-off-by: Srinivasa Deevi <srinivasa.deevi@conexant.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-video.c')
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx-video.c | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c index 47e2da8ae19a..fc7260a71e8e 100644 --- a/drivers/media/video/cx231xx/cx231xx-video.c +++ b/drivers/media/video/cx231xx/cx231xx-video.c | |||
@@ -365,10 +365,11 @@ static inline int cx231xx_isoc_copy(struct cx231xx *dev, struct urb *urb) | |||
365 | bytes_parsed = 0; | 365 | bytes_parsed = 0; |
366 | 366 | ||
367 | if (dma_q->is_partial_line) { | 367 | if (dma_q->is_partial_line) { |
368 | /* Handle the case where we were working on a partial line */ | 368 | /* Handle the case of a partial line */ |
369 | sav_eav = dma_q->last_sav; | 369 | sav_eav = dma_q->last_sav; |
370 | } else { | 370 | } else { |
371 | /* Check for a SAV/EAV overlapping the buffer boundary */ | 371 | /* Check for a SAV/EAV overlapping |
372 | the buffer boundary */ | ||
372 | sav_eav = | 373 | sav_eav = |
373 | cx231xx_find_boundary_SAV_EAV(p_buffer, | 374 | cx231xx_find_boundary_SAV_EAV(p_buffer, |
374 | dma_q->partial_buf, | 375 | dma_q->partial_buf, |
@@ -380,9 +381,9 @@ static inline int cx231xx_isoc_copy(struct cx231xx *dev, struct urb *urb) | |||
380 | the last buffer or a partial line */ | 381 | the last buffer or a partial line */ |
381 | if (sav_eav) { | 382 | if (sav_eav) { |
382 | bytes_parsed += cx231xx_get_video_line(dev, dma_q, | 383 | bytes_parsed += cx231xx_get_video_line(dev, dma_q, |
383 | sav_eav, /* SAV/EAV */ | 384 | sav_eav, /* SAV/EAV */ |
384 | p_buffer + bytes_parsed, /* p_buffer */ | 385 | p_buffer + bytes_parsed, /* p_buffer */ |
385 | buffer_size - bytes_parsed); /* buffer size */ | 386 | buffer_size - bytes_parsed);/* buf size */ |
386 | } | 387 | } |
387 | 388 | ||
388 | /* Now parse data that is completely in this buffer */ | 389 | /* Now parse data that is completely in this buffer */ |
@@ -391,18 +392,19 @@ static inline int cx231xx_isoc_copy(struct cx231xx *dev, struct urb *urb) | |||
391 | while (bytes_parsed < buffer_size) { | 392 | while (bytes_parsed < buffer_size) { |
392 | u32 bytes_used = 0; | 393 | u32 bytes_used = 0; |
393 | 394 | ||
394 | sav_eav = cx231xx_find_next_SAV_EAV(p_buffer + bytes_parsed, /* p_buffer */ | 395 | sav_eav = cx231xx_find_next_SAV_EAV( |
395 | buffer_size - bytes_parsed, /* buffer size */ | 396 | p_buffer + bytes_parsed, /* p_buffer */ |
396 | &bytes_used); /* Receives bytes used to get SAV/EAV */ | 397 | buffer_size - bytes_parsed, /* buf size */ |
398 | &bytes_used);/* bytes used to get SAV/EAV */ | ||
397 | 399 | ||
398 | bytes_parsed += bytes_used; | 400 | bytes_parsed += bytes_used; |
399 | 401 | ||
400 | sav_eav &= 0xF0; | 402 | sav_eav &= 0xF0; |
401 | if (sav_eav && (bytes_parsed < buffer_size)) { | 403 | if (sav_eav && (bytes_parsed < buffer_size)) { |
402 | bytes_parsed += cx231xx_get_video_line(dev, | 404 | bytes_parsed += cx231xx_get_video_line(dev, |
403 | dma_q, sav_eav, /* SAV/EAV */ | 405 | dma_q, sav_eav, /* SAV/EAV */ |
404 | p_buffer + bytes_parsed, /* p_buffer */ | 406 | p_buffer + bytes_parsed,/* p_buffer */ |
405 | buffer_size - bytes_parsed); /* buffer size */ | 407 | buffer_size - bytes_parsed);/*buf size*/ |
406 | } | 408 | } |
407 | } | 409 | } |
408 | 410 | ||
@@ -1398,9 +1400,11 @@ static int vidioc_s_frequency(struct file *file, void *priv, | |||
1398 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 1400 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
1399 | 1401 | ||
1400 | /* | 1402 | /* |
1401 | -R, --list-registers=type=<host/i2cdrv/i2caddr>,chip=<chip>[,min=<addr>,max=<addr>] | 1403 | -R, --list-registers=type=<host/i2cdrv/i2caddr>, |
1404 | chip=<chip>[,min=<addr>,max=<addr>] | ||
1402 | dump registers from <min> to <max> [VIDIOC_DBG_G_REGISTER] | 1405 | dump registers from <min> to <max> [VIDIOC_DBG_G_REGISTER] |
1403 | -r, --set-register=type=<host/i2cdrv/i2caddr>,chip=<chip>,reg=<addr>,val=<val> | 1406 | -r, --set-register=type=<host/i2cdrv/i2caddr>, |
1407 | chip=<chip>,reg=<addr>,val=<val> | ||
1404 | set the register [VIDIOC_DBG_S_REGISTER] | 1408 | set the register [VIDIOC_DBG_S_REGISTER] |
1405 | 1409 | ||
1406 | if type == host, then <chip> is the hosts chip ID (default 0) | 1410 | if type == host, then <chip> is the hosts chip ID (default 0) |
@@ -2332,8 +2336,9 @@ static struct video_device cx231xx_radio_template = { | |||
2332 | 2336 | ||
2333 | /******************************** usb interface ******************************/ | 2337 | /******************************** usb interface ******************************/ |
2334 | 2338 | ||
2335 | static struct video_device *cx231xx_vdev_init(struct cx231xx *dev, const struct video_device | 2339 | static struct video_device *cx231xx_vdev_init(struct cx231xx *dev, |
2336 | *template, const char *type_name) | 2340 | const struct video_device |
2341 | *template, const char *type_name) | ||
2337 | { | 2342 | { |
2338 | struct video_device *vfd; | 2343 | struct video_device *vfd; |
2339 | 2344 | ||