aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2007-08-27 17:16:54 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 21:07:29 -0400
commitb930e1d851c3ffbf82127bd0e4d72ffe94d4b7f2 (patch)
tree190561aa866401ac4d2b45f7a6c6bb5d9cb982a3 /drivers/media
parent38051450b378ef2cb51dff76a6b8299f59129172 (diff)
V4L/DVB (6125): whitespace cleanup: replace leading spaces with tabs
There were many instances of 7-space indents spread throughout the v4l-dvb tree. This patch replaces the 7-space indents with tabs. The whitespace cleaner script doesn't catch these, because it assumes that all indents are 8-space. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/cinergyT2/cinergyT2.c6
-rw-r--r--drivers/media/dvb/ttpci/av7110_hw.c28
-rw-r--r--drivers/media/radio/radio-terratec.c2
-rw-r--r--drivers/media/video/bt8xx/bttv-cards.c22
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c4
-rw-r--r--drivers/media/video/cx88/cx88-mpeg.c70
-rw-r--r--drivers/media/video/cx88/cx88-tvaudio.c6
-rw-r--r--drivers/media/video/msp3400-driver.c10
-rw-r--r--drivers/media/video/planb.c30
-rw-r--r--drivers/media/video/pwc/pwc-ctrl.c2
-rw-r--r--drivers/media/video/pwc/pwc-if.c4
-rw-r--r--drivers/media/video/saa7134/saa7134-alsa.c2
12 files changed, 93 insertions, 93 deletions
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index b910fa0baa07..5a12b5679556 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -548,19 +548,19 @@ static unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct
548{ 548{
549 struct dvb_device *dvbdev = file->private_data; 549 struct dvb_device *dvbdev = file->private_data;
550 struct cinergyt2 *cinergyt2 = dvbdev->priv; 550 struct cinergyt2 *cinergyt2 = dvbdev->priv;
551 unsigned int mask = 0; 551 unsigned int mask = 0;
552 552
553 if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem)) 553 if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem))
554 return -ERESTARTSYS; 554 return -ERESTARTSYS;
555 555
556 poll_wait(file, &cinergyt2->poll_wq, wait); 556 poll_wait(file, &cinergyt2->poll_wq, wait);
557 557
558 if (cinergyt2->pending_fe_events != 0) 558 if (cinergyt2->pending_fe_events != 0)
559 mask |= (POLLIN | POLLRDNORM | POLLPRI); 559 mask |= (POLLIN | POLLRDNORM | POLLPRI);
560 560
561 mutex_unlock(&cinergyt2->sem); 561 mutex_unlock(&cinergyt2->sem);
562 562
563 return mask; 563 return mask;
564} 564}
565 565
566 566
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c
index 515e8232e020..a468aa2e4854 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/drivers/media/dvb/ttpci/av7110_hw.c
@@ -978,24 +978,24 @@ static int OSDSetColor(struct av7110 *av7110, u8 color, u8 r, u8 g, u8 b, u8 ble
978 978
979static int OSDSetPalette(struct av7110 *av7110, u32 __user * colors, u8 first, u8 last) 979static int OSDSetPalette(struct av7110 *av7110, u32 __user * colors, u8 first, u8 last)
980{ 980{
981 int i; 981 int i;
982 int length = last - first + 1; 982 int length = last - first + 1;
983 983
984 if (length * 4 > DATA_BUFF3_SIZE) 984 if (length * 4 > DATA_BUFF3_SIZE)
985 return -EINVAL; 985 return -EINVAL;
986 986
987 for (i = 0; i < length; i++) { 987 for (i = 0; i < length; i++) {
988 u32 color, blend, yuv; 988 u32 color, blend, yuv;
989 989
990 if (get_user(color, colors + i)) 990 if (get_user(color, colors + i))
991 return -EFAULT; 991 return -EFAULT;
992 blend = (color & 0xF0000000) >> 4; 992 blend = (color & 0xF0000000) >> 4;
993 yuv = blend ? RGB2YUV(color & 0xFF, (color >> 8) & 0xFF, 993 yuv = blend ? RGB2YUV(color & 0xFF, (color >> 8) & 0xFF,
994 (color >> 16) & 0xFF) | blend : 0; 994 (color >> 16) & 0xFF) | blend : 0;
995 yuv = ((yuv & 0xFFFF0000) >> 16) | ((yuv & 0x0000FFFF) << 16); 995 yuv = ((yuv & 0xFFFF0000) >> 16) | ((yuv & 0x0000FFFF) << 16);
996 wdebi(av7110, DEBINOSWAP, DATA_BUFF3_BASE + i * 4, yuv, 4); 996 wdebi(av7110, DEBINOSWAP, DATA_BUFF3_BASE + i * 4, yuv, 4);
997 } 997 }
998 return av7110_fw_cmd(av7110, COMTYPE_OSD, Set_Palette, 4, 998 return av7110_fw_cmd(av7110, COMTYPE_OSD, Set_Palette, 4,
999 av7110->osdwin, 999 av7110->osdwin,
1000 bpp2pal[av7110->osdbpp[av7110->osdwin]], 1000 bpp2pal[av7110->osdbpp[av7110->osdwin]],
1001 first, last); 1001 first, last);
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index 7e1911c3d54e..535ffe8c8102 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -173,7 +173,7 @@ static int tt_setfreq(struct tt_device *dev, unsigned long freq1)
173 i--; 173 i--;
174 p--; 174 p--;
175 temp = temp/2; 175 temp = temp/2;
176 } 176 }
177 177
178 spin_lock(&lock); 178 spin_lock(&lock);
179 179
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 1f4f2625395e..900d18e14060 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -3275,15 +3275,15 @@ static void eagle_muxsel(struct bttv *btv, unsigned int input)
3275 btaor((2)<<5, ~(3<<5), BT848_IFORM); 3275 btaor((2)<<5, ~(3<<5), BT848_IFORM);
3276 gpio_bits(3,bttv_tvcards[btv->c.type].muxsel[input&7]); 3276 gpio_bits(3,bttv_tvcards[btv->c.type].muxsel[input&7]);
3277 3277
3278 /* composite */ 3278 /* composite */
3279 /* set chroma ADC to sleep */ 3279 /* set chroma ADC to sleep */
3280 btor(BT848_ADC_C_SLEEP, BT848_ADC); 3280 btor(BT848_ADC_C_SLEEP, BT848_ADC);
3281 /* set to composite video */ 3281 /* set to composite video */
3282 btand(~BT848_CONTROL_COMP, BT848_E_CONTROL); 3282 btand(~BT848_CONTROL_COMP, BT848_E_CONTROL);
3283 btand(~BT848_CONTROL_COMP, BT848_O_CONTROL); 3283 btand(~BT848_CONTROL_COMP, BT848_O_CONTROL);
3284 3284
3285 /* switch sync drive off */ 3285 /* switch sync drive off */
3286 gpio_bits(LM1882_SYNC_DRIVE,LM1882_SYNC_DRIVE); 3286 gpio_bits(LM1882_SYNC_DRIVE,LM1882_SYNC_DRIVE);
3287} 3287}
3288 3288
3289static void gvc1100_muxsel(struct bttv *btv, unsigned int input) 3289static void gvc1100_muxsel(struct bttv *btv, unsigned int input)
@@ -3452,7 +3452,7 @@ void __devinit bttv_init_card2(struct bttv *btv)
3452 printk("bttv%d: radio detected by subsystem id (CPH05x)\n",btv->c.nr); 3452 printk("bttv%d: radio detected by subsystem id (CPH05x)\n",btv->c.nr);
3453 } 3453 }
3454 break; 3454 break;
3455 case BTTV_BOARD_STB2: 3455 case BTTV_BOARD_STB2:
3456 if (btv->cardid == 0x3060121a) { 3456 if (btv->cardid == 0x3060121a) {
3457 /* Fix up entry for 3DFX VoodooTV 100, 3457 /* Fix up entry for 3DFX VoodooTV 100,
3458 which is an OEM STB card variant. */ 3458 which is an OEM STB card variant. */
@@ -3783,7 +3783,7 @@ static void __devinit osprey_eeprom(struct bttv *btv, const u8 ee[256])
3783 for (i = 12; i < 21; i++) 3783 for (i = 12; i < 21; i++)
3784 serial *= 10, serial += ee[i] - '0'; 3784 serial *= 10, serial += ee[i] - '0';
3785 } 3785 }
3786 } else { 3786 } else {
3787 unsigned short type; 3787 unsigned short type;
3788 3788
3789 for (i = 4*16; i < 8*16; i += 16) { 3789 for (i = 4*16; i < 8*16; i += 16) {
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 47007380a98a..fcaf4f51293f 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1077,7 +1077,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
1077 struct cx8802_driver *drv = NULL; 1077 struct cx8802_driver *drv = NULL;
1078 int err; 1078 int err;
1079 1079
1080 dev = cx8802_get_device(inode); 1080 dev = cx8802_get_device(inode);
1081 1081
1082 dprintk( 1, "%s\n", __FUNCTION__); 1082 dprintk( 1, "%s\n", __FUNCTION__);
1083 1083
@@ -1234,7 +1234,7 @@ static struct video_device cx8802_mpeg_template =
1234 .vidioc_s_tuner = vidioc_s_tuner, 1234 .vidioc_s_tuner = vidioc_s_tuner,
1235 .vidioc_s_std = vidioc_s_std, 1235 .vidioc_s_std = vidioc_s_std,
1236 .tvnorms = CX88_NORMS, 1236 .tvnorms = CX88_NORMS,
1237 .current_norm = V4L2_STD_NTSC_M, 1237 .current_norm = V4L2_STD_NTSC_M,
1238}; 1238};
1239 1239
1240/* ------------------------------------------------------------------ */ 1240/* ------------------------------------------------------------------ */
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 4e6a84f15d17..d302793fcfb9 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -179,43 +179,43 @@ static int cx8802_restart_queue(struct cx8802_dev *dev,
179 struct cx88_buffer *buf; 179 struct cx88_buffer *buf;
180 struct list_head *item; 180 struct list_head *item;
181 181
182 dprintk( 1, "cx8802_restart_queue\n" ); 182 dprintk( 1, "cx8802_restart_queue\n" );
183 if (list_empty(&q->active)) 183 if (list_empty(&q->active))
184 { 184 {
185 struct cx88_buffer *prev; 185 struct cx88_buffer *prev;
186 prev = NULL; 186 prev = NULL;
187 187
188 dprintk(1, "cx8802_restart_queue: queue is empty\n" ); 188 dprintk(1, "cx8802_restart_queue: queue is empty\n" );
189 189
190 for (;;) { 190 for (;;) {
191 if (list_empty(&q->queued)) 191 if (list_empty(&q->queued))
192 return 0; 192 return 0;
193 buf = list_entry(q->queued.next, struct cx88_buffer, vb.queue); 193 buf = list_entry(q->queued.next, struct cx88_buffer, vb.queue);
194 if (NULL == prev) { 194 if (NULL == prev) {
195 list_del(&buf->vb.queue); 195 list_del(&buf->vb.queue);
196 list_add_tail(&buf->vb.queue,&q->active); 196 list_add_tail(&buf->vb.queue,&q->active);
197 cx8802_start_dma(dev, q, buf); 197 cx8802_start_dma(dev, q, buf);
198 buf->vb.state = STATE_ACTIVE; 198 buf->vb.state = STATE_ACTIVE;
199 buf->count = q->count++; 199 buf->count = q->count++;
200 mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT); 200 mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
201 dprintk(1,"[%p/%d] restart_queue - first active\n", 201 dprintk(1,"[%p/%d] restart_queue - first active\n",
202 buf,buf->vb.i); 202 buf,buf->vb.i);
203 203
204 } else if (prev->vb.width == buf->vb.width && 204 } else if (prev->vb.width == buf->vb.width &&
205 prev->vb.height == buf->vb.height && 205 prev->vb.height == buf->vb.height &&
206 prev->fmt == buf->fmt) { 206 prev->fmt == buf->fmt) {
207 list_del(&buf->vb.queue); 207 list_del(&buf->vb.queue);
208 list_add_tail(&buf->vb.queue,&q->active); 208 list_add_tail(&buf->vb.queue,&q->active);
209 buf->vb.state = STATE_ACTIVE; 209 buf->vb.state = STATE_ACTIVE;
210 buf->count = q->count++; 210 buf->count = q->count++;
211 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma); 211 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
212 dprintk(1,"[%p/%d] restart_queue - move to active\n", 212 dprintk(1,"[%p/%d] restart_queue - move to active\n",
213 buf,buf->vb.i); 213 buf,buf->vb.i);
214 } else { 214 } else {
215 return 0; 215 return 0;
216 } 216 }
217 prev = buf; 217 prev = buf;
218 } 218 }
219 return 0; 219 return 0;
220 } 220 }
221 221
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index 82364fb07025..76e5c78d8ae4 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -798,9 +798,9 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
798 core->astat = reg; 798 core->astat = reg;
799 799
800/* TODO 800/* TODO
801 Reading from AUD_STATUS is not enough 801 Reading from AUD_STATUS is not enough
802 for auto-detecting sap/dual-fm/nicam. 802 for auto-detecting sap/dual-fm/nicam.
803 Add some code here later. 803 Add some code here later.
804*/ 804*/
805 805
806 return; 806 return;
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index e9d400e19a5d..c0c87e06259b 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -244,17 +244,17 @@ int msp_write_dsp(struct i2c_client *client, int addr, int val)
244 * ----------------------------------------------------------------------- */ 244 * ----------------------------------------------------------------------- */
245 245
246static int scarts[3][9] = { 246static int scarts[3][9] = {
247 /* MASK IN1 IN2 IN3 IN4 IN1_DA IN2_DA MONO MUTE */ 247 /* MASK IN1 IN2 IN3 IN4 IN1_DA IN2_DA MONO MUTE */
248 /* SCART DSP Input select */ 248 /* SCART DSP Input select */
249 { 0x0320, 0x0000, 0x0200, 0x0300, 0x0020, -1, -1, 0x0100, 0x0320 }, 249 { 0x0320, 0x0000, 0x0200, 0x0300, 0x0020, -1, -1, 0x0100, 0x0320 },
250 /* SCART1 Output select */ 250 /* SCART1 Output select */
251 { 0x0c40, 0x0440, 0x0400, 0x0000, 0x0840, 0x0c00, 0x0040, 0x0800, 0x0c40 }, 251 { 0x0c40, 0x0440, 0x0400, 0x0000, 0x0840, 0x0c00, 0x0040, 0x0800, 0x0c40 },
252 /* SCART2 Output select */ 252 /* SCART2 Output select */
253 { 0x3080, 0x1000, 0x1080, 0x2080, 0x3080, 0x0000, 0x0080, 0x2000, 0x3000 }, 253 { 0x3080, 0x1000, 0x1080, 0x2080, 0x3080, 0x0000, 0x0080, 0x2000, 0x3000 },
254}; 254};
255 255
256static char *scart_names[] = { 256static char *scart_names[] = {
257 "in1", "in2", "in3", "in4", "in1 da", "in2 da", "mono", "mute" 257 "in1", "in2", "in3", "in4", "in1 da", "in2 da", "mono", "mute"
258}; 258};
259 259
260void msp_set_scart(struct i2c_client *client, int in, int out) 260void msp_set_scart(struct i2c_client *client, int in, int out)
diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c
index 4ab1af74a970..0ef73d9d5848 100644
--- a/drivers/media/video/planb.c
+++ b/drivers/media/video/planb.c
@@ -844,21 +844,21 @@ cmd_tab_mask_end:
844/*********************************/ 844/*********************************/
845 845
846static int palette2fmt[] = { 846static int palette2fmt[] = {
847 0, 847 0,
848 PLANB_GRAY, 848 PLANB_GRAY,
849 0, 849 0,
850 0, 850 0,
851 0, 851 0,
852 PLANB_COLOUR32, 852 PLANB_COLOUR32,
853 PLANB_COLOUR15, 853 PLANB_COLOUR15,
854 0, 854 0,
855 0, 855 0,
856 0, 856 0,
857 0, 857 0,
858 0, 858 0,
859 0, 859 0,
860 0, 860 0,
861 0, 861 0,
862}; 862};
863 863
864#define PLANB_PALETTE_MAX 15 864#define PLANB_PALETTE_MAX 15
diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c
index 338ced7188f2..ea53316d2111 100644
--- a/drivers/media/video/pwc/pwc-ctrl.c
+++ b/drivers/media/video/pwc/pwc-ctrl.c
@@ -1648,7 +1648,7 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
1648 ARG_OUT(cmd) 1648 ARG_OUT(cmd)
1649 break; 1649 break;
1650 } 1650 }
1651 /* 1651 /*
1652 case VIDIOCPWCGVIDTABLE: 1652 case VIDIOCPWCGVIDTABLE:
1653 { 1653 {
1654 ARG_DEF(struct pwc_table_init_buffer, table); 1654 ARG_DEF(struct pwc_table_init_buffer, table);
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index d3ac70a0d9ca..1088ebf5744f 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -126,9 +126,9 @@ static struct usb_driver pwc_driver = {
126static int default_size = PSZ_QCIF; 126static int default_size = PSZ_QCIF;
127static int default_fps = 10; 127static int default_fps = 10;
128static int default_fbufs = 3; /* Default number of frame buffers */ 128static int default_fbufs = 3; /* Default number of frame buffers */
129 int pwc_mbufs = 2; /* Default number of mmap() buffers */ 129 int pwc_mbufs = 2; /* Default number of mmap() buffers */
130#ifdef CONFIG_USB_PWC_DEBUG 130#ifdef CONFIG_USB_PWC_DEBUG
131 int pwc_trace = PWC_DEBUG_LEVEL; 131 int pwc_trace = PWC_DEBUG_LEVEL;
132#endif 132#endif
133static int power_save = 0; 133static int power_save = 0;
134static int led_on = 100, led_off = 0; /* defaults to LED that is on while in use */ 134static int led_on = 100, led_off = 0; /* defaults to LED that is on while in use */
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index eb5e77dd0d18..c6f7279669c1 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -312,7 +312,7 @@ static int dsp_buffer_free(struct saa7134_dev *dev)
312 dev->dmasound.blksize = 0; 312 dev->dmasound.blksize = 0;
313 dev->dmasound.bufsize = 0; 313 dev->dmasound.bufsize = 0;
314 314
315 return 0; 315 return 0;
316} 316}
317 317
318 318