aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-03-10 23:58:12 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-17 23:47:01 -0400
commit000f64efc7fe6693261a78a0164c0e805553631b (patch)
tree002cf81ecb243bfe35a24f89a053ba51b2f02bf9 /drivers/media
parent6721b51ece65967fe628007fee3e16479c07afd1 (diff)
V4L/DVB: Fix bad whitespacing
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/az6027.c10
-rw-r--r--drivers/media/dvb/frontends/atbm8830_priv.h2
-rw-r--r--drivers/media/dvb/mantis/mantis_vp1041.c10
-rw-r--r--drivers/media/video/davinci/isif_regs.h2
-rw-r--r--drivers/media/video/gspca/ov534.c2
-rw-r--r--drivers/media/video/ov9640.c6
6 files changed, 16 insertions, 16 deletions
diff --git a/drivers/media/dvb/dvb-usb/az6027.c b/drivers/media/dvb/dvb-usb/az6027.c
index 60787a28edb3..30ea3eff1ef7 100644
--- a/drivers/media/dvb/dvb-usb/az6027.c
+++ b/drivers/media/dvb/dvb-usb/az6027.c
@@ -125,12 +125,12 @@ static const struct stb0899_s1_reg az6027_stb0899_s1_init_3[] = {
125 { STB0899_RCOMPC , 0xc9 }, 125 { STB0899_RCOMPC , 0xc9 },
126 { STB0899_AGC1CN , 0x01 }, 126 { STB0899_AGC1CN , 0x01 },
127 { STB0899_AGC1REF , 0x10 }, 127 { STB0899_AGC1REF , 0x10 },
128 { STB0899_RTC , 0x23 }, 128 { STB0899_RTC , 0x23 },
129 { STB0899_TMGCFG , 0x4e }, 129 { STB0899_TMGCFG , 0x4e },
130 { STB0899_AGC2REF , 0x34 }, 130 { STB0899_AGC2REF , 0x34 },
131 { STB0899_TLSR , 0x84 }, 131 { STB0899_TLSR , 0x84 },
132 { STB0899_CFD , 0xf7 }, 132 { STB0899_CFD , 0xf7 },
133 { STB0899_ACLC , 0x87 }, 133 { STB0899_ACLC , 0x87 },
134 { STB0899_BCLC , 0x94 }, 134 { STB0899_BCLC , 0x94 },
135 { STB0899_EQON , 0x41 }, 135 { STB0899_EQON , 0x41 },
136 { STB0899_LDT , 0xf1 }, 136 { STB0899_LDT , 0xf1 },
@@ -183,10 +183,10 @@ static const struct stb0899_s1_reg az6027_stb0899_s1_init_3[] = {
183 { STB0899_ECNT3M , 0x0a }, 183 { STB0899_ECNT3M , 0x0a },
184 { STB0899_ECNT3L , 0xad }, 184 { STB0899_ECNT3L , 0xad },
185 { STB0899_FECAUTO1 , 0x06 }, 185 { STB0899_FECAUTO1 , 0x06 },
186 { STB0899_FECM , 0x01 }, 186 { STB0899_FECM , 0x01 },
187 { STB0899_VTH12 , 0xb0 }, 187 { STB0899_VTH12 , 0xb0 },
188 { STB0899_VTH23 , 0x7a }, 188 { STB0899_VTH23 , 0x7a },
189 { STB0899_VTH34 , 0x58 }, 189 { STB0899_VTH34 , 0x58 },
190 { STB0899_VTH56 , 0x38 }, 190 { STB0899_VTH56 , 0x38 },
191 { STB0899_VTH67 , 0x34 }, 191 { STB0899_VTH67 , 0x34 },
192 { STB0899_VTH78 , 0x24 }, 192 { STB0899_VTH78 , 0x24 },
@@ -195,7 +195,7 @@ static const struct stb0899_s1_reg az6027_stb0899_s1_init_3[] = {
195 { STB0899_RSULC , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */ 195 { STB0899_RSULC , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */
196 { STB0899_TSULC , 0x42 }, 196 { STB0899_TSULC , 0x42 },
197 { STB0899_RSLLC , 0x41 }, 197 { STB0899_RSLLC , 0x41 },
198 { STB0899_TSLPL , 0x12 }, 198 { STB0899_TSLPL , 0x12 },
199 { STB0899_TSCFGH , 0x0c }, 199 { STB0899_TSCFGH , 0x0c },
200 { STB0899_TSCFGM , 0x00 }, 200 { STB0899_TSCFGM , 0x00 },
201 { STB0899_TSCFGL , 0x00 }, 201 { STB0899_TSCFGL , 0x00 },
diff --git a/drivers/media/dvb/frontends/atbm8830_priv.h b/drivers/media/dvb/frontends/atbm8830_priv.h
index ce960f76092a..d460058d497e 100644
--- a/drivers/media/dvb/frontends/atbm8830_priv.h
+++ b/drivers/media/dvb/frontends/atbm8830_priv.h
@@ -18,7 +18,7 @@
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 */ 20 */
21 21
22#ifndef __ATBM8830_PRIV_H 22#ifndef __ATBM8830_PRIV_H
23#define __ATBM8830_PRIV_H 23#define __ATBM8830_PRIV_H
24 24
diff --git a/drivers/media/dvb/mantis/mantis_vp1041.c b/drivers/media/dvb/mantis/mantis_vp1041.c
index 515346dd31d0..d1aa2bc0c155 100644
--- a/drivers/media/dvb/mantis/mantis_vp1041.c
+++ b/drivers/media/dvb/mantis/mantis_vp1041.c
@@ -136,12 +136,12 @@ static const struct stb0899_s1_reg vp1041_stb0899_s1_init_3[] = {
136 { STB0899_RCOMPC , 0xc9 }, 136 { STB0899_RCOMPC , 0xc9 },
137 { STB0899_AGC1CN , 0x01 }, 137 { STB0899_AGC1CN , 0x01 },
138 { STB0899_AGC1REF , 0x10 }, 138 { STB0899_AGC1REF , 0x10 },
139 { STB0899_RTC , 0x23 }, 139 { STB0899_RTC , 0x23 },
140 { STB0899_TMGCFG , 0x4e }, 140 { STB0899_TMGCFG , 0x4e },
141 { STB0899_AGC2REF , 0x34 }, 141 { STB0899_AGC2REF , 0x34 },
142 { STB0899_TLSR , 0x84 }, 142 { STB0899_TLSR , 0x84 },
143 { STB0899_CFD , 0xf7 }, 143 { STB0899_CFD , 0xf7 },
144 { STB0899_ACLC , 0x87 }, 144 { STB0899_ACLC , 0x87 },
145 { STB0899_BCLC , 0x94 }, 145 { STB0899_BCLC , 0x94 },
146 { STB0899_EQON , 0x41 }, 146 { STB0899_EQON , 0x41 },
147 { STB0899_LDT , 0xf1 }, 147 { STB0899_LDT , 0xf1 },
@@ -194,10 +194,10 @@ static const struct stb0899_s1_reg vp1041_stb0899_s1_init_3[] = {
194 { STB0899_ECNT3M , 0x0a }, 194 { STB0899_ECNT3M , 0x0a },
195 { STB0899_ECNT3L , 0xad }, 195 { STB0899_ECNT3L , 0xad },
196 { STB0899_FECAUTO1 , 0x06 }, 196 { STB0899_FECAUTO1 , 0x06 },
197 { STB0899_FECM , 0x01 }, 197 { STB0899_FECM , 0x01 },
198 { STB0899_VTH12 , 0xb0 }, 198 { STB0899_VTH12 , 0xb0 },
199 { STB0899_VTH23 , 0x7a }, 199 { STB0899_VTH23 , 0x7a },
200 { STB0899_VTH34 , 0x58 }, 200 { STB0899_VTH34 , 0x58 },
201 { STB0899_VTH56 , 0x38 }, 201 { STB0899_VTH56 , 0x38 },
202 { STB0899_VTH67 , 0x34 }, 202 { STB0899_VTH67 , 0x34 },
203 { STB0899_VTH78 , 0x24 }, 203 { STB0899_VTH78 , 0x24 },
@@ -206,7 +206,7 @@ static const struct stb0899_s1_reg vp1041_stb0899_s1_init_3[] = {
206 { STB0899_RSULC , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */ 206 { STB0899_RSULC , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */
207 { STB0899_TSULC , 0x42 }, 207 { STB0899_TSULC , 0x42 },
208 { STB0899_RSLLC , 0x41 }, 208 { STB0899_RSLLC , 0x41 },
209 { STB0899_TSLPL , 0x12 }, 209 { STB0899_TSLPL , 0x12 },
210 { STB0899_TSCFGH , 0x0c }, 210 { STB0899_TSCFGH , 0x0c },
211 { STB0899_TSCFGM , 0x00 }, 211 { STB0899_TSCFGM , 0x00 },
212 { STB0899_TSCFGL , 0x00 }, 212 { STB0899_TSCFGL , 0x00 },
diff --git a/drivers/media/video/davinci/isif_regs.h b/drivers/media/video/davinci/isif_regs.h
index f7b8893a2957..aa69a463c122 100644
--- a/drivers/media/video/davinci/isif_regs.h
+++ b/drivers/media/video/davinci/isif_regs.h
@@ -158,7 +158,7 @@
158 158
159/* gain - offset masks */ 159/* gain - offset masks */
160#define GAIN_INTEGER_SHIFT 9 160#define GAIN_INTEGER_SHIFT 9
161#define OFFSET_MASK 0xFFF 161#define OFFSET_MASK 0xFFF
162#define GAIN_SDRAM_EN_SHIFT 12 162#define GAIN_SDRAM_EN_SHIFT 12
163#define GAIN_IPIPE_EN_SHIFT 13 163#define GAIN_IPIPE_EN_SHIFT 13
164#define GAIN_H3A_EN_SHIFT 14 164#define GAIN_H3A_EN_SHIFT 14
diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c
index 8cd193d18b74..dc1e4efe30fb 100644
--- a/drivers/media/video/gspca/ov534.c
+++ b/drivers/media/video/gspca/ov534.c
@@ -709,7 +709,7 @@ static void setexposure(struct gspca_dev *gspca_dev)
709 709
710 /* 'val' is one byte and represents half of the exposure value we are 710 /* 'val' is one byte and represents half of the exposure value we are
711 * going to set into registers, a two bytes value: 711 * going to set into registers, a two bytes value:
712 * 712 *
713 * MSB: ((u16) val << 1) >> 8 == val >> 7 713 * MSB: ((u16) val << 1) >> 8 == val >> 7
714 * LSB: ((u16) val << 1) & 0xff == val << 1 714 * LSB: ((u16) val << 1) & 0xff == val << 1
715 */ 715 */
diff --git a/drivers/media/video/ov9640.c b/drivers/media/video/ov9640.c
index 47bf60ceb7a2..36599a65f548 100644
--- a/drivers/media/video/ov9640.c
+++ b/drivers/media/video/ov9640.c
@@ -59,9 +59,9 @@ static const struct ov9640_reg ov9640_regs_dflt[] = {
59 * COM12 |= OV9640_COM12_YUV_AVG 59 * COM12 |= OV9640_COM12_YUV_AVG
60 * 60 *
61 * for RGB, alter the following registers: 61 * for RGB, alter the following registers:
62 * COM7 |= OV9640_COM7_RGB 62 * COM7 |= OV9640_COM7_RGB
63 * COM13 |= OV9640_COM13_RGB_AVG 63 * COM13 |= OV9640_COM13_RGB_AVG
64 * COM15 |= proper RGB color encoding mode 64 * COM15 |= proper RGB color encoding mode
65 */ 65 */
66static const struct ov9640_reg ov9640_regs_qqcif[] = { 66static const struct ov9640_reg ov9640_regs_qqcif[] = {
67 { OV9640_CLKRC, OV9640_CLKRC_DPLL_EN | OV9640_CLKRC_DIV(0x0f) }, 67 { OV9640_CLKRC, OV9640_CLKRC_DPLL_EN | OV9640_CLKRC_DIV(0x0f) },