aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7164/saa7164-core.c
diff options
context:
space:
mode:
authorSteven Toth <stoth@kernellabs.com>2010-11-12 16:32:36 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 05:16:39 -0500
commitbc25068495b110fcdf35a22f43d32637e99fd018 (patch)
tree569ce8d98e0d46e583f5e897e8aa36cd3dd88bf7 /drivers/media/video/saa7164/saa7164-core.c
parent0e72cc8b8d48ba05e705f432fb99aaa0ea6737c6 (diff)
[media] saa7164: Checkpatch compliance cleanup
Checkpatch compliance cleanup across files in the saa7164 driver. Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7164/saa7164-core.c')
-rw-r--r--drivers/media/video/saa7164/saa7164-core.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c
index b66f78f7042c..d6bf3f82cc34 100644
--- a/drivers/media/video/saa7164/saa7164-core.c
+++ b/drivers/media/video/saa7164/saa7164-core.c
@@ -40,12 +40,12 @@ MODULE_AUTHOR("Steven Toth <stoth@kernellabs.com>");
40MODULE_LICENSE("GPL"); 40MODULE_LICENSE("GPL");
41 41
42/* 42/*
43 1 Basic 43 * 1 Basic
44 2 44 * 2
45 4 i2c 45 * 4 i2c
46 8 api 46 * 8 api
47 16 cmd 47 * 16 cmd
48 32 bus 48 * 32 bus
49 */ 49 */
50 50
51unsigned int saa_debug; 51unsigned int saa_debug;
@@ -82,7 +82,8 @@ MODULE_PARM_DESC(crc_checking, "enable crc sanity checking on buffers");
82 82
83unsigned int guard_checking = 1; 83unsigned int guard_checking = 1;
84module_param(guard_checking, int, 0644); 84module_param(guard_checking, int, 0644);
85MODULE_PARM_DESC(guard_checking, "enable dma sanity checking for buffer overruns"); 85MODULE_PARM_DESC(guard_checking,
86 "enable dma sanity checking for buffer overruns");
86 87
87static unsigned int saa7164_devcount; 88static unsigned int saa7164_devcount;
88 89
@@ -123,7 +124,9 @@ static void saa7164_pack_verifier(struct saa7164_buffer *buf)
123 if ((*(p + i + 0) != 0x00) || (*(p + i + 1) != 0x00) || 124 if ((*(p + i + 0) != 0x00) || (*(p + i + 1) != 0x00) ||
124 (*(p + i + 2) != 0x01) || (*(p + i + 3) != 0xBA)) { 125 (*(p + i + 2) != 0x01) || (*(p + i + 3) != 0xBA)) {
125 printk(KERN_ERR "No pack at 0x%x\n", i); 126 printk(KERN_ERR "No pack at 0x%x\n", i);
126// saa7164_dumphex16FF(buf->port->dev, (p + i), 32); 127#if 0
128 saa7164_dumphex16FF(buf->port->dev, (p + i), 32);
129#endif
127 } 130 }
128 } 131 }
129} 132}
@@ -199,19 +202,16 @@ static void saa7164_histogram_reset(struct saa7164_histogram *hg, char *name)
199 strcpy(hg->name, name); 202 strcpy(hg->name, name);
200 203
201 /* First 30ms x 1ms */ 204 /* First 30ms x 1ms */
202 for (i = 0; i < 30; i++) { 205 for (i = 0; i < 30; i++)
203 hg->counter1[0 + i].val = i; 206 hg->counter1[0 + i].val = i;
204 }
205 207
206 /* 30 - 200ms x 10ms */ 208 /* 30 - 200ms x 10ms */
207 for (i = 0; i < 18; i++) { 209 for (i = 0; i < 18; i++)
208 hg->counter1[30 + i].val = 30 + (i * 10); 210 hg->counter1[30 + i].val = 30 + (i * 10);
209 }
210 211
211 /* 200 - 2000ms x 100ms */ 212 /* 200 - 2000ms x 100ms */
212 for (i = 0; i < 15; i++) { 213 for (i = 0; i < 15; i++)
213 hg->counter1[48 + i].val = 200 + (i * 200); 214 hg->counter1[48 + i].val = 200 + (i * 200);
214 }
215 215
216 /* Catch all massive value (2secs) */ 216 /* Catch all massive value (2secs) */
217 hg->counter1[55].val = 2000; 217 hg->counter1[55].val = 2000;
@@ -315,7 +315,9 @@ static void saa7164_work_enchandler_helper(struct saa7164_port *port, int bufnr)
315 (*(p + buf->actual_size + 0x13) != 0xff)) { 315 (*(p + buf->actual_size + 0x13) != 0xff)) {
316 printk(KERN_ERR "%s() buf %p guard buffer breach\n", 316 printk(KERN_ERR "%s() buf %p guard buffer breach\n",
317 __func__, buf); 317 __func__, buf);
318// saa7164_dumphex16FF(dev, (p + buf->actual_size) - 32 , 64); 318#if 0
319 saa7164_dumphex16FF(dev, (p + buf->actual_size) - 32 , 64);
320#endif
319 } 321 }
320 } 322 }
321 323
@@ -961,9 +963,7 @@ static int saa7164_port_init(struct saa7164_dev *dev, int portnr)
961 963
962 /* We need a deferred interrupt handler for cmd handling */ 964 /* We need a deferred interrupt handler for cmd handling */
963 INIT_WORK(&port->workenc, saa7164_work_enchandler); 965 INIT_WORK(&port->workenc, saa7164_work_enchandler);
964 } 966 } else if ((portnr == SAA7164_PORT_VBI1) || (portnr == SAA7164_PORT_VBI2)) {
965 else
966 if ((portnr == SAA7164_PORT_VBI1) || (portnr == SAA7164_PORT_VBI2)) {
967 port->type = SAA7164_MPEG_VBI; 967 port->type = SAA7164_MPEG_VBI;
968 968
969 /* We need a deferred interrupt handler for cmd handling */ 969 /* We need a deferred interrupt handler for cmd handling */
@@ -1169,7 +1169,7 @@ static int saa7164_proc_open(struct inode *inode, struct file *filp)
1169 return single_open(filp, saa7164_proc_show, NULL); 1169 return single_open(filp, saa7164_proc_show, NULL);
1170} 1170}
1171 1171
1172static struct file_operations saa7164_proc_fops = { 1172static const struct file_operations saa7164_proc_fops = {
1173 .open = saa7164_proc_open, 1173 .open = saa7164_proc_open,
1174 .read = seq_read, 1174 .read = seq_read,
1175 .llseek = seq_lseek, 1175 .llseek = seq_lseek,