aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
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/dvb
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/dvb')
-rw-r--r--drivers/media/dvb/cinergyT2/cinergyT2.c6
-rw-r--r--drivers/media/dvb/ttpci/av7110_hw.c28
2 files changed, 17 insertions, 17 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);