diff options
author | Jean-François Moine <moinejf@free.fr> | 2010-10-19 03:29:10 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 12:50:06 -0400 |
commit | 780e312175f688ab5ab6124c91d46fa2b9afe2d2 (patch) | |
tree | 3830f521b82765b0cfa71e7bb1a4a617091d685f /drivers/media/video/gspca/stv06xx | |
parent | 76ad3b684ae6bf43662f8fc57501e4ad0e3b12e8 (diff) |
[media] gspca: Fix coding style issues
The errors were found by checkpatch.pl. Most fixes are:
- remove spaces followed by TAB(s),
- split lines greater than 80 characters,
- move most '{'s from start of line to end of previous line.
(Some '{'s at start of line remain when the '}'s are on the same line)
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/stv06xx')
-rw-r--r-- | drivers/media/video/gspca/stv06xx/stv06xx.h | 2 | ||||
-rw-r--r-- | drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c | 19 | ||||
-rw-r--r-- | drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h | 2 | ||||
-rw-r--r-- | drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c | 2 | ||||
-rw-r--r-- | drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 4 |
5 files changed, 15 insertions, 14 deletions
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.h b/drivers/media/video/gspca/stv06xx/stv06xx.h index 053a27e3a400..e0f63c51f40d 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx.h +++ b/drivers/media/video/gspca/stv06xx/stv06xx.h | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | #define STV_ISOC_ENDPOINT_ADDR 0x81 | 38 | #define STV_ISOC_ENDPOINT_ADDR 0x81 |
39 | 39 | ||
40 | #define STV_REG23 0x0423 | 40 | #define STV_REG23 0x0423 |
41 | 41 | ||
42 | /* Control registers of the STV0600 ASIC */ | 42 | /* Control registers of the STV0600 ASIC */ |
43 | #define STV_I2C_PARTNER 0x1420 | 43 | #define STV_I2C_PARTNER 0x1420 |
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c b/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c index 706e08dc5254..17531b41a073 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c +++ b/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c | |||
@@ -39,8 +39,8 @@ static const struct ctrl hdcs1x00_ctrl[] = { | |||
39 | .minimum = 0x00, | 39 | .minimum = 0x00, |
40 | .maximum = 0xff, | 40 | .maximum = 0xff, |
41 | .step = 0x1, | 41 | .step = 0x1, |
42 | .default_value = HDCS_DEFAULT_EXPOSURE, | 42 | .default_value = HDCS_DEFAULT_EXPOSURE, |
43 | .flags = V4L2_CTRL_FLAG_SLIDER | 43 | .flags = V4L2_CTRL_FLAG_SLIDER |
44 | }, | 44 | }, |
45 | .set = hdcs_set_exposure, | 45 | .set = hdcs_set_exposure, |
46 | .get = hdcs_get_exposure | 46 | .get = hdcs_get_exposure |
@@ -52,8 +52,8 @@ static const struct ctrl hdcs1x00_ctrl[] = { | |||
52 | .minimum = 0x00, | 52 | .minimum = 0x00, |
53 | .maximum = 0xff, | 53 | .maximum = 0xff, |
54 | .step = 0x1, | 54 | .step = 0x1, |
55 | .default_value = HDCS_DEFAULT_GAIN, | 55 | .default_value = HDCS_DEFAULT_GAIN, |
56 | .flags = V4L2_CTRL_FLAG_SLIDER | 56 | .flags = V4L2_CTRL_FLAG_SLIDER |
57 | }, | 57 | }, |
58 | .set = hdcs_set_gain, | 58 | .set = hdcs_set_gain, |
59 | .get = hdcs_get_gain | 59 | .get = hdcs_get_gain |
@@ -83,8 +83,8 @@ static const struct ctrl hdcs1020_ctrl[] = { | |||
83 | .minimum = 0x00, | 83 | .minimum = 0x00, |
84 | .maximum = 0xffff, | 84 | .maximum = 0xffff, |
85 | .step = 0x1, | 85 | .step = 0x1, |
86 | .default_value = HDCS_DEFAULT_EXPOSURE, | 86 | .default_value = HDCS_DEFAULT_EXPOSURE, |
87 | .flags = V4L2_CTRL_FLAG_SLIDER | 87 | .flags = V4L2_CTRL_FLAG_SLIDER |
88 | }, | 88 | }, |
89 | .set = hdcs_set_exposure, | 89 | .set = hdcs_set_exposure, |
90 | .get = hdcs_get_exposure | 90 | .get = hdcs_get_exposure |
@@ -96,8 +96,8 @@ static const struct ctrl hdcs1020_ctrl[] = { | |||
96 | .minimum = 0x00, | 96 | .minimum = 0x00, |
97 | .maximum = 0xff, | 97 | .maximum = 0xff, |
98 | .step = 0x1, | 98 | .step = 0x1, |
99 | .default_value = HDCS_DEFAULT_GAIN, | 99 | .default_value = HDCS_DEFAULT_GAIN, |
100 | .flags = V4L2_CTRL_FLAG_SLIDER | 100 | .flags = V4L2_CTRL_FLAG_SLIDER |
101 | }, | 101 | }, |
102 | .set = hdcs_set_gain, | 102 | .set = hdcs_set_gain, |
103 | .get = hdcs_get_gain | 103 | .get = hdcs_get_gain |
@@ -163,7 +163,8 @@ static int hdcs_reg_write_seq(struct sd *sd, u8 reg, u8 *vals, u8 len) | |||
163 | for (i = 0; i < len; i++) { | 163 | for (i = 0; i < len; i++) { |
164 | regs[2 * i] = reg; | 164 | regs[2 * i] = reg; |
165 | regs[2 * i + 1] = vals[i]; | 165 | regs[2 * i + 1] = vals[i]; |
166 | /* All addresses are shifted left one bit as bit 0 toggles r/w */ | 166 | /* All addresses are shifted left one bit |
167 | * as bit 0 toggles r/w */ | ||
167 | reg += 2; | 168 | reg += 2; |
168 | } | 169 | } |
169 | 170 | ||
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h b/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h index 37b31c99d956..cf3d0ccc1121 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h +++ b/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h | |||
@@ -37,7 +37,7 @@ | |||
37 | #define HDCS_REG_CONTROL(sd) (IS_1020(sd) ? HDCS20_CONTROL : HDCS00_CONTROL) | 37 | #define HDCS_REG_CONTROL(sd) (IS_1020(sd) ? HDCS20_CONTROL : HDCS00_CONTROL) |
38 | 38 | ||
39 | #define HDCS_1X00_DEF_WIDTH 360 | 39 | #define HDCS_1X00_DEF_WIDTH 360 |
40 | #define HDCS_1X00_DEF_HEIGHT 296 | 40 | #define HDCS_1X00_DEF_HEIGHT 296 |
41 | 41 | ||
42 | #define HDCS_1020_DEF_WIDTH 352 | 42 | #define HDCS_1020_DEF_WIDTH 352 |
43 | #define HDCS_1020_DEF_HEIGHT 292 | 43 | #define HDCS_1020_DEF_HEIGHT 292 |
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c b/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c index 11a0c002f5dc..f8398434c328 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c +++ b/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c | |||
@@ -66,7 +66,7 @@ static const struct ctrl vv6410_ctrl[] = { | |||
66 | .minimum = 0, | 66 | .minimum = 0, |
67 | .maximum = 1, | 67 | .maximum = 1, |
68 | .step = 1, | 68 | .step = 1, |
69 | .default_value = 0 | 69 | .default_value = 0 |
70 | }, | 70 | }, |
71 | .set = vv6410_set_vflip, | 71 | .set = vv6410_set_vflip, |
72 | .get = vv6410_get_vflip | 72 | .get = vv6410_get_vflip |
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h b/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h index 96c61926d372..b3b5508473bc 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h +++ b/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | |||
@@ -157,8 +157,8 @@ | |||
157 | /* Audio Amplifier Setup Register */ | 157 | /* Audio Amplifier Setup Register */ |
158 | #define VV6410_AT1 0x79 | 158 | #define VV6410_AT1 0x79 |
159 | 159 | ||
160 | #define VV6410_HFLIP (1 << 3) | 160 | #define VV6410_HFLIP (1 << 3) |
161 | #define VV6410_VFLIP (1 << 4) | 161 | #define VV6410_VFLIP (1 << 4) |
162 | 162 | ||
163 | #define VV6410_LOW_POWER_MODE (1 << 0) | 163 | #define VV6410_LOW_POWER_MODE (1 << 0) |
164 | #define VV6410_SOFT_RESET (1 << 2) | 164 | #define VV6410_SOFT_RESET (1 << 2) |