提交 b930e1d8 编写于 作者: M Michael Krufky 提交者: Mauro Carvalho Chehab

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: NMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>
上级 38051450
...@@ -548,19 +548,19 @@ static unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct ...@@ -548,19 +548,19 @@ static unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct
{ {
struct dvb_device *dvbdev = file->private_data; struct dvb_device *dvbdev = file->private_data;
struct cinergyt2 *cinergyt2 = dvbdev->priv; struct cinergyt2 *cinergyt2 = dvbdev->priv;
unsigned int mask = 0; unsigned int mask = 0;
if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem)) if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem))
return -ERESTARTSYS; return -ERESTARTSYS;
poll_wait(file, &cinergyt2->poll_wq, wait); poll_wait(file, &cinergyt2->poll_wq, wait);
if (cinergyt2->pending_fe_events != 0) if (cinergyt2->pending_fe_events != 0)
mask |= (POLLIN | POLLRDNORM | POLLPRI); mask |= (POLLIN | POLLRDNORM | POLLPRI);
mutex_unlock(&cinergyt2->sem); mutex_unlock(&cinergyt2->sem);
return mask; return mask;
} }
......
...@@ -978,24 +978,24 @@ static int OSDSetColor(struct av7110 *av7110, u8 color, u8 r, u8 g, u8 b, u8 ble ...@@ -978,24 +978,24 @@ static int OSDSetColor(struct av7110 *av7110, u8 color, u8 r, u8 g, u8 b, u8 ble
static int OSDSetPalette(struct av7110 *av7110, u32 __user * colors, u8 first, u8 last) static int OSDSetPalette(struct av7110 *av7110, u32 __user * colors, u8 first, u8 last)
{ {
int i; int i;
int length = last - first + 1; int length = last - first + 1;
if (length * 4 > DATA_BUFF3_SIZE) if (length * 4 > DATA_BUFF3_SIZE)
return -EINVAL; return -EINVAL;
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
u32 color, blend, yuv; u32 color, blend, yuv;
if (get_user(color, colors + i)) if (get_user(color, colors + i))
return -EFAULT; return -EFAULT;
blend = (color & 0xF0000000) >> 4; blend = (color & 0xF0000000) >> 4;
yuv = blend ? RGB2YUV(color & 0xFF, (color >> 8) & 0xFF, yuv = blend ? RGB2YUV(color & 0xFF, (color >> 8) & 0xFF,
(color >> 16) & 0xFF) | blend : 0; (color >> 16) & 0xFF) | blend : 0;
yuv = ((yuv & 0xFFFF0000) >> 16) | ((yuv & 0x0000FFFF) << 16); yuv = ((yuv & 0xFFFF0000) >> 16) | ((yuv & 0x0000FFFF) << 16);
wdebi(av7110, DEBINOSWAP, DATA_BUFF3_BASE + i * 4, yuv, 4); wdebi(av7110, DEBINOSWAP, DATA_BUFF3_BASE + i * 4, yuv, 4);
} }
return av7110_fw_cmd(av7110, COMTYPE_OSD, Set_Palette, 4, return av7110_fw_cmd(av7110, COMTYPE_OSD, Set_Palette, 4,
av7110->osdwin, av7110->osdwin,
bpp2pal[av7110->osdbpp[av7110->osdwin]], bpp2pal[av7110->osdbpp[av7110->osdwin]],
first, last); first, last);
......
...@@ -173,7 +173,7 @@ static int tt_setfreq(struct tt_device *dev, unsigned long freq1) ...@@ -173,7 +173,7 @@ static int tt_setfreq(struct tt_device *dev, unsigned long freq1)
i--; i--;
p--; p--;
temp = temp/2; temp = temp/2;
} }
spin_lock(&lock); spin_lock(&lock);
......
...@@ -3275,15 +3275,15 @@ static void eagle_muxsel(struct bttv *btv, unsigned int input) ...@@ -3275,15 +3275,15 @@ static void eagle_muxsel(struct bttv *btv, unsigned int input)
btaor((2)<<5, ~(3<<5), BT848_IFORM); btaor((2)<<5, ~(3<<5), BT848_IFORM);
gpio_bits(3,bttv_tvcards[btv->c.type].muxsel[input&7]); gpio_bits(3,bttv_tvcards[btv->c.type].muxsel[input&7]);
/* composite */ /* composite */
/* set chroma ADC to sleep */ /* set chroma ADC to sleep */
btor(BT848_ADC_C_SLEEP, BT848_ADC); btor(BT848_ADC_C_SLEEP, BT848_ADC);
/* set to composite video */ /* set to composite video */
btand(~BT848_CONTROL_COMP, BT848_E_CONTROL); btand(~BT848_CONTROL_COMP, BT848_E_CONTROL);
btand(~BT848_CONTROL_COMP, BT848_O_CONTROL); btand(~BT848_CONTROL_COMP, BT848_O_CONTROL);
/* switch sync drive off */ /* switch sync drive off */
gpio_bits(LM1882_SYNC_DRIVE,LM1882_SYNC_DRIVE); gpio_bits(LM1882_SYNC_DRIVE,LM1882_SYNC_DRIVE);
} }
static void gvc1100_muxsel(struct bttv *btv, unsigned int input) static void gvc1100_muxsel(struct bttv *btv, unsigned int input)
...@@ -3452,7 +3452,7 @@ void __devinit bttv_init_card2(struct bttv *btv) ...@@ -3452,7 +3452,7 @@ void __devinit bttv_init_card2(struct bttv *btv)
printk("bttv%d: radio detected by subsystem id (CPH05x)\n",btv->c.nr); printk("bttv%d: radio detected by subsystem id (CPH05x)\n",btv->c.nr);
} }
break; break;
case BTTV_BOARD_STB2: case BTTV_BOARD_STB2:
if (btv->cardid == 0x3060121a) { if (btv->cardid == 0x3060121a) {
/* Fix up entry for 3DFX VoodooTV 100, /* Fix up entry for 3DFX VoodooTV 100,
which is an OEM STB card variant. */ which is an OEM STB card variant. */
...@@ -3783,7 +3783,7 @@ static void __devinit osprey_eeprom(struct bttv *btv, const u8 ee[256]) ...@@ -3783,7 +3783,7 @@ static void __devinit osprey_eeprom(struct bttv *btv, const u8 ee[256])
for (i = 12; i < 21; i++) for (i = 12; i < 21; i++)
serial *= 10, serial += ee[i] - '0'; serial *= 10, serial += ee[i] - '0';
} }
} else { } else {
unsigned short type; unsigned short type;
for (i = 4*16; i < 8*16; i += 16) { for (i = 4*16; i < 8*16; i += 16) {
......
...@@ -1077,7 +1077,7 @@ static int mpeg_open(struct inode *inode, struct file *file) ...@@ -1077,7 +1077,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
struct cx8802_driver *drv = NULL; struct cx8802_driver *drv = NULL;
int err; int err;
dev = cx8802_get_device(inode); dev = cx8802_get_device(inode);
dprintk( 1, "%s\n", __FUNCTION__); dprintk( 1, "%s\n", __FUNCTION__);
...@@ -1234,7 +1234,7 @@ static struct video_device cx8802_mpeg_template = ...@@ -1234,7 +1234,7 @@ static struct video_device cx8802_mpeg_template =
.vidioc_s_tuner = vidioc_s_tuner, .vidioc_s_tuner = vidioc_s_tuner,
.vidioc_s_std = vidioc_s_std, .vidioc_s_std = vidioc_s_std,
.tvnorms = CX88_NORMS, .tvnorms = CX88_NORMS,
.current_norm = V4L2_STD_NTSC_M, .current_norm = V4L2_STD_NTSC_M,
}; };
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
......
...@@ -179,43 +179,43 @@ static int cx8802_restart_queue(struct cx8802_dev *dev, ...@@ -179,43 +179,43 @@ static int cx8802_restart_queue(struct cx8802_dev *dev,
struct cx88_buffer *buf; struct cx88_buffer *buf;
struct list_head *item; struct list_head *item;
dprintk( 1, "cx8802_restart_queue\n" ); dprintk( 1, "cx8802_restart_queue\n" );
if (list_empty(&q->active)) if (list_empty(&q->active))
{ {
struct cx88_buffer *prev; struct cx88_buffer *prev;
prev = NULL; prev = NULL;
dprintk(1, "cx8802_restart_queue: queue is empty\n" ); dprintk(1, "cx8802_restart_queue: queue is empty\n" );
for (;;) { for (;;) {
if (list_empty(&q->queued)) if (list_empty(&q->queued))
return 0; return 0;
buf = list_entry(q->queued.next, struct cx88_buffer, vb.queue); buf = list_entry(q->queued.next, struct cx88_buffer, vb.queue);
if (NULL == prev) { if (NULL == prev) {
list_del(&buf->vb.queue); list_del(&buf->vb.queue);
list_add_tail(&buf->vb.queue,&q->active); list_add_tail(&buf->vb.queue,&q->active);
cx8802_start_dma(dev, q, buf); cx8802_start_dma(dev, q, buf);
buf->vb.state = STATE_ACTIVE; buf->vb.state = STATE_ACTIVE;
buf->count = q->count++; buf->count = q->count++;
mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT); mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
dprintk(1,"[%p/%d] restart_queue - first active\n", dprintk(1,"[%p/%d] restart_queue - first active\n",
buf,buf->vb.i); buf,buf->vb.i);
} else if (prev->vb.width == buf->vb.width && } else if (prev->vb.width == buf->vb.width &&
prev->vb.height == buf->vb.height && prev->vb.height == buf->vb.height &&
prev->fmt == buf->fmt) { prev->fmt == buf->fmt) {
list_del(&buf->vb.queue); list_del(&buf->vb.queue);
list_add_tail(&buf->vb.queue,&q->active); list_add_tail(&buf->vb.queue,&q->active);
buf->vb.state = STATE_ACTIVE; buf->vb.state = STATE_ACTIVE;
buf->count = q->count++; buf->count = q->count++;
prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma); prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
dprintk(1,"[%p/%d] restart_queue - move to active\n", dprintk(1,"[%p/%d] restart_queue - move to active\n",
buf,buf->vb.i); buf,buf->vb.i);
} else { } else {
return 0; return 0;
} }
prev = buf; prev = buf;
} }
return 0; return 0;
} }
......
...@@ -798,9 +798,9 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t) ...@@ -798,9 +798,9 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
core->astat = reg; core->astat = reg;
/* TODO /* TODO
Reading from AUD_STATUS is not enough Reading from AUD_STATUS is not enough
for auto-detecting sap/dual-fm/nicam. for auto-detecting sap/dual-fm/nicam.
Add some code here later. Add some code here later.
*/ */
return; return;
......
...@@ -244,17 +244,17 @@ int msp_write_dsp(struct i2c_client *client, int addr, int val) ...@@ -244,17 +244,17 @@ int msp_write_dsp(struct i2c_client *client, int addr, int val)
* ----------------------------------------------------------------------- */ * ----------------------------------------------------------------------- */
static int scarts[3][9] = { static int scarts[3][9] = {
/* MASK IN1 IN2 IN3 IN4 IN1_DA IN2_DA MONO MUTE */ /* MASK IN1 IN2 IN3 IN4 IN1_DA IN2_DA MONO MUTE */
/* SCART DSP Input select */ /* SCART DSP Input select */
{ 0x0320, 0x0000, 0x0200, 0x0300, 0x0020, -1, -1, 0x0100, 0x0320 }, { 0x0320, 0x0000, 0x0200, 0x0300, 0x0020, -1, -1, 0x0100, 0x0320 },
/* SCART1 Output select */ /* SCART1 Output select */
{ 0x0c40, 0x0440, 0x0400, 0x0000, 0x0840, 0x0c00, 0x0040, 0x0800, 0x0c40 }, { 0x0c40, 0x0440, 0x0400, 0x0000, 0x0840, 0x0c00, 0x0040, 0x0800, 0x0c40 },
/* SCART2 Output select */ /* SCART2 Output select */
{ 0x3080, 0x1000, 0x1080, 0x2080, 0x3080, 0x0000, 0x0080, 0x2000, 0x3000 }, { 0x3080, 0x1000, 0x1080, 0x2080, 0x3080, 0x0000, 0x0080, 0x2000, 0x3000 },
}; };
static char *scart_names[] = { static char *scart_names[] = {
"in1", "in2", "in3", "in4", "in1 da", "in2 da", "mono", "mute" "in1", "in2", "in3", "in4", "in1 da", "in2 da", "mono", "mute"
}; };
void msp_set_scart(struct i2c_client *client, int in, int out) void msp_set_scart(struct i2c_client *client, int in, int out)
......
...@@ -844,21 +844,21 @@ static void cmd_buff(struct planb *pb) ...@@ -844,21 +844,21 @@ static void cmd_buff(struct planb *pb)
/*********************************/ /*********************************/
static int palette2fmt[] = { static int palette2fmt[] = {
0, 0,
PLANB_GRAY, PLANB_GRAY,
0, 0,
0, 0,
0, 0,
PLANB_COLOUR32, PLANB_COLOUR32,
PLANB_COLOUR15, PLANB_COLOUR15,
0, 0,
0, 0,
0, 0,
0, 0,
0, 0,
0, 0,
0, 0,
0, 0,
}; };
#define PLANB_PALETTE_MAX 15 #define PLANB_PALETTE_MAX 15
......
...@@ -1648,7 +1648,7 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg) ...@@ -1648,7 +1648,7 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
ARG_OUT(cmd) ARG_OUT(cmd)
break; break;
} }
/* /*
case VIDIOCPWCGVIDTABLE: case VIDIOCPWCGVIDTABLE:
{ {
ARG_DEF(struct pwc_table_init_buffer, table); ARG_DEF(struct pwc_table_init_buffer, table);
......
...@@ -126,9 +126,9 @@ static struct usb_driver pwc_driver = { ...@@ -126,9 +126,9 @@ static struct usb_driver pwc_driver = {
static int default_size = PSZ_QCIF; static int default_size = PSZ_QCIF;
static int default_fps = 10; static int default_fps = 10;
static int default_fbufs = 3; /* Default number of frame buffers */ static int default_fbufs = 3; /* Default number of frame buffers */
int pwc_mbufs = 2; /* Default number of mmap() buffers */ int pwc_mbufs = 2; /* Default number of mmap() buffers */
#ifdef CONFIG_USB_PWC_DEBUG #ifdef CONFIG_USB_PWC_DEBUG
int pwc_trace = PWC_DEBUG_LEVEL; int pwc_trace = PWC_DEBUG_LEVEL;
#endif #endif
static int power_save = 0; static int power_save = 0;
static int led_on = 100, led_off = 0; /* defaults to LED that is on while in use */ static int led_on = 100, led_off = 0; /* defaults to LED that is on while in use */
......
...@@ -312,7 +312,7 @@ static int dsp_buffer_free(struct saa7134_dev *dev) ...@@ -312,7 +312,7 @@ static int dsp_buffer_free(struct saa7134_dev *dev)
dev->dmasound.blksize = 0; dev->dmasound.blksize = 0;
dev->dmasound.bufsize = 0; dev->dmasound.bufsize = 0;
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册