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/mx3_camera.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/mx3_camera.c')
-rw-r--r-- | drivers/media/video/mx3_camera.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c index 7db82bdf6f31..ae7d48324493 100644 --- a/drivers/media/video/mx3_camera.c +++ b/drivers/media/video/mx3_camera.c | |||
@@ -564,8 +564,10 @@ static int test_platform_param(struct mx3_camera_dev *mx3_cam, | |||
564 | SOCAM_DATA_ACTIVE_HIGH | | 564 | SOCAM_DATA_ACTIVE_HIGH | |
565 | SOCAM_DATA_ACTIVE_LOW; | 565 | SOCAM_DATA_ACTIVE_LOW; |
566 | 566 | ||
567 | /* If requested data width is supported by the platform, use it or any | 567 | /* |
568 | * possible lower value - i.MX31 is smart enough to schift bits */ | 568 | * If requested data width is supported by the platform, use it or any |
569 | * possible lower value - i.MX31 is smart enough to schift bits | ||
570 | */ | ||
569 | switch (buswidth) { | 571 | switch (buswidth) { |
570 | case 15: | 572 | case 15: |
571 | if (!(mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_15)) | 573 | if (!(mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_15)) |
@@ -1027,8 +1029,10 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt) | |||
1027 | common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING; | 1029 | common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING; |
1028 | } | 1030 | } |
1029 | 1031 | ||
1030 | /* Make the camera work in widest common mode, we'll take care of | 1032 | /* |
1031 | * the rest */ | 1033 | * Make the camera work in widest common mode, we'll take care of |
1034 | * the rest | ||
1035 | */ | ||
1032 | if (common_flags & SOCAM_DATAWIDTH_15) | 1036 | if (common_flags & SOCAM_DATAWIDTH_15) |
1033 | common_flags = (common_flags & ~SOCAM_DATAWIDTH_MASK) | | 1037 | common_flags = (common_flags & ~SOCAM_DATAWIDTH_MASK) | |
1034 | SOCAM_DATAWIDTH_15; | 1038 | SOCAM_DATAWIDTH_15; |
@@ -1152,8 +1156,10 @@ static int __devinit mx3_camera_probe(struct platform_device *pdev) | |||
1152 | if (!(mx3_cam->platform_flags & (MX3_CAMERA_DATAWIDTH_4 | | 1156 | if (!(mx3_cam->platform_flags & (MX3_CAMERA_DATAWIDTH_4 | |
1153 | MX3_CAMERA_DATAWIDTH_8 | MX3_CAMERA_DATAWIDTH_10 | | 1157 | MX3_CAMERA_DATAWIDTH_8 | MX3_CAMERA_DATAWIDTH_10 | |
1154 | MX3_CAMERA_DATAWIDTH_15))) { | 1158 | MX3_CAMERA_DATAWIDTH_15))) { |
1155 | /* Platform hasn't set available data widths. This is bad. | 1159 | /* |
1156 | * Warn and use a default. */ | 1160 | * Platform hasn't set available data widths. This is bad. |
1161 | * Warn and use a default. | ||
1162 | */ | ||
1157 | dev_warn(&pdev->dev, "WARNING! Platform hasn't set available " | 1163 | dev_warn(&pdev->dev, "WARNING! Platform hasn't set available " |
1158 | "data widths, using default 8 bit\n"); | 1164 | "data widths, using default 8 bit\n"); |
1159 | mx3_cam->platform_flags |= MX3_CAMERA_DATAWIDTH_8; | 1165 | mx3_cam->platform_flags |= MX3_CAMERA_DATAWIDTH_8; |