diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-12-11 09:15:05 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-16 06:27:15 -0500 |
commit | 5d28d525452f170e30bc038955439731462a5228 (patch) | |
tree | 319c221f63b580cdec53a046b2fe5af2e0b92b36 /drivers/media/video/mt9m001.c | |
parent | 325361088b73269f4cc96256276a142addbf3454 (diff) |
V4L/DVB (13645): soc-camera: fix multi-line comment coding style
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/mt9m001.c')
-rw-r--r-- | drivers/media/video/mt9m001.c | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c index 17be2d46fd40..cc9066000c2d 100644 --- a/drivers/media/video/mt9m001.c +++ b/drivers/media/video/mt9m001.c | |||
@@ -17,9 +17,11 @@ | |||
17 | #include <media/v4l2-chip-ident.h> | 17 | #include <media/v4l2-chip-ident.h> |
18 | #include <media/soc_camera.h> | 18 | #include <media/soc_camera.h> |
19 | 19 | ||
20 | /* mt9m001 i2c address 0x5d | 20 | /* |
21 | * mt9m001 i2c address 0x5d | ||
21 | * The platform has to define ctruct i2c_board_info objects and link to them | 22 | * The platform has to define ctruct i2c_board_info objects and link to them |
22 | * from struct soc_camera_link */ | 23 | * from struct soc_camera_link |
24 | */ | ||
23 | 25 | ||
24 | /* mt9m001 selected register addresses */ | 26 | /* mt9m001 selected register addresses */ |
25 | #define MT9M001_CHIP_VERSION 0x00 | 27 | #define MT9M001_CHIP_VERSION 0x00 |
@@ -47,8 +49,10 @@ | |||
47 | #define MT9M001_ROW_SKIP 12 | 49 | #define MT9M001_ROW_SKIP 12 |
48 | 50 | ||
49 | static const struct soc_camera_data_format mt9m001_colour_formats[] = { | 51 | static const struct soc_camera_data_format mt9m001_colour_formats[] = { |
50 | /* Order important: first natively supported, | 52 | /* |
51 | * second supported with a GPIO extender */ | 53 | * Order important: first natively supported, |
54 | * second supported with a GPIO extender | ||
55 | */ | ||
52 | { | 56 | { |
53 | .name = "Bayer (sRGB) 10 bit", | 57 | .name = "Bayer (sRGB) 10 bit", |
54 | .depth = 10, | 58 | .depth = 10, |
@@ -230,8 +234,10 @@ static int mt9m001_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) | |||
230 | if (!ret) | 234 | if (!ret) |
231 | ret = reg_write(client, MT9M001_VERTICAL_BLANKING, vblank); | 235 | ret = reg_write(client, MT9M001_VERTICAL_BLANKING, vblank); |
232 | 236 | ||
233 | /* The caller provides a supported format, as verified per | 237 | /* |
234 | * call to icd->try_fmt() */ | 238 | * The caller provides a supported format, as verified per |
239 | * call to icd->try_fmt() | ||
240 | */ | ||
235 | if (!ret) | 241 | if (!ret) |
236 | ret = reg_write(client, MT9M001_COLUMN_START, rect.left); | 242 | ret = reg_write(client, MT9M001_COLUMN_START, rect.left); |
237 | if (!ret) | 243 | if (!ret) |
@@ -569,8 +575,10 @@ static int mt9m001_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) | |||
569 | return 0; | 575 | return 0; |
570 | } | 576 | } |
571 | 577 | ||
572 | /* Interface active, can use i2c. If it fails, it can indeed mean, that | 578 | /* |
573 | * this wasn't our capture interface, so, we wait for the right one */ | 579 | * Interface active, can use i2c. If it fails, it can indeed mean, that |
580 | * this wasn't our capture interface, so, we wait for the right one | ||
581 | */ | ||
574 | static int mt9m001_video_probe(struct soc_camera_device *icd, | 582 | static int mt9m001_video_probe(struct soc_camera_device *icd, |
575 | struct i2c_client *client) | 583 | struct i2c_client *client) |
576 | { | 584 | { |
@@ -580,8 +588,10 @@ static int mt9m001_video_probe(struct soc_camera_device *icd, | |||
580 | unsigned long flags; | 588 | unsigned long flags; |
581 | int ret; | 589 | int ret; |
582 | 590 | ||
583 | /* We must have a parent by now. And it cannot be a wrong one. | 591 | /* |
584 | * So this entire test is completely redundant. */ | 592 | * We must have a parent by now. And it cannot be a wrong one. |
593 | * So this entire test is completely redundant. | ||
594 | */ | ||
585 | if (!icd->dev.parent || | 595 | if (!icd->dev.parent || |
586 | to_soc_camera_host(icd->dev.parent)->nr != icd->iface) | 596 | to_soc_camera_host(icd->dev.parent)->nr != icd->iface) |
587 | return -ENODEV; | 597 | return -ENODEV; |
@@ -737,8 +747,10 @@ static int mt9m001_probe(struct i2c_client *client, | |||
737 | mt9m001->rect.width = MT9M001_MAX_WIDTH; | 747 | mt9m001->rect.width = MT9M001_MAX_WIDTH; |
738 | mt9m001->rect.height = MT9M001_MAX_HEIGHT; | 748 | mt9m001->rect.height = MT9M001_MAX_HEIGHT; |
739 | 749 | ||
740 | /* Simulated autoexposure. If enabled, we calculate shutter width | 750 | /* |
741 | * ourselves in the driver based on vertical blanking and frame width */ | 751 | * Simulated autoexposure. If enabled, we calculate shutter width |
752 | * ourselves in the driver based on vertical blanking and frame width | ||
753 | */ | ||
742 | mt9m001->autoexposure = 1; | 754 | mt9m001->autoexposure = 1; |
743 | 755 | ||
744 | ret = mt9m001_video_probe(icd, client); | 756 | ret = mt9m001_video_probe(icd, client); |