aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <lyakh@axis700.grange>2008-12-01 07:44:56 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 06:38:22 -0500
commitabe4c4710386a4859dae9193bfc9a1f0e3c60db4 (patch)
treec79775dd7c3ccaca468f93e911b218bc3ea44787
parenta2c8c68cca3dbb0c87f5034ab8ea29350174ec4a (diff)
V4L/DVB (9786): soc-camera: formatting fixes
Minor formatting fixes Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/soc_camera.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 2ebdf4d667e3..7217de21e76b 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -35,8 +35,8 @@ static LIST_HEAD(devices);
35static DEFINE_MUTEX(list_lock); 35static DEFINE_MUTEX(list_lock);
36static DEFINE_MUTEX(video_lock); 36static DEFINE_MUTEX(video_lock);
37 37
38const static struct soc_camera_data_format* 38const static struct soc_camera_data_format *format_by_fourcc(
39format_by_fourcc(struct soc_camera_device *icd, unsigned int fourcc) 39 struct soc_camera_device *icd, unsigned int fourcc)
40{ 40{
41 unsigned int i; 41 unsigned int i;
42 42
@@ -47,7 +47,7 @@ format_by_fourcc(struct soc_camera_device *icd, unsigned int fourcc)
47} 47}
48 48
49static int soc_camera_try_fmt_vid_cap(struct file *file, void *priv, 49static int soc_camera_try_fmt_vid_cap(struct file *file, void *priv,
50 struct v4l2_format *f) 50 struct v4l2_format *f)
51{ 51{
52 struct soc_camera_file *icf = file->private_data; 52 struct soc_camera_file *icf = file->private_data;
53 struct soc_camera_device *icd = icf->icd; 53 struct soc_camera_device *icd = icf->icd;
@@ -260,7 +260,7 @@ static int soc_camera_close(struct inode *inode, struct file *file)
260} 260}
261 261
262static ssize_t soc_camera_read(struct file *file, char __user *buf, 262static ssize_t soc_camera_read(struct file *file, char __user *buf,
263 size_t count, loff_t *ppos) 263 size_t count, loff_t *ppos)
264{ 264{
265 struct soc_camera_file *icf = file->private_data; 265 struct soc_camera_file *icf = file->private_data;
266 struct soc_camera_device *icd = icf->icd; 266 struct soc_camera_device *icd = icf->icd;
@@ -305,7 +305,6 @@ static unsigned int soc_camera_poll(struct file *file, poll_table *pt)
305 return ici->ops->poll(file, pt); 305 return ici->ops->poll(file, pt);
306} 306}
307 307
308
309static struct file_operations soc_camera_fops = { 308static struct file_operations soc_camera_fops = {
310 .owner = THIS_MODULE, 309 .owner = THIS_MODULE,
311 .open = soc_camera_open, 310 .open = soc_camera_open,
@@ -317,9 +316,8 @@ static struct file_operations soc_camera_fops = {
317 .llseek = no_llseek, 316 .llseek = no_llseek,
318}; 317};
319 318
320
321static int soc_camera_s_fmt_vid_cap(struct file *file, void *priv, 319static int soc_camera_s_fmt_vid_cap(struct file *file, void *priv,
322 struct v4l2_format *f) 320 struct v4l2_format *f)
323{ 321{
324 struct soc_camera_file *icf = file->private_data; 322 struct soc_camera_file *icf = file->private_data;
325 struct soc_camera_device *icd = icf->icd; 323 struct soc_camera_device *icd = icf->icd;
@@ -366,7 +364,7 @@ static int soc_camera_s_fmt_vid_cap(struct file *file, void *priv,
366} 364}
367 365
368static int soc_camera_enum_fmt_vid_cap(struct file *file, void *priv, 366static int soc_camera_enum_fmt_vid_cap(struct file *file, void *priv,
369 struct v4l2_fmtdesc *f) 367 struct v4l2_fmtdesc *f)
370{ 368{
371 struct soc_camera_file *icf = file->private_data; 369 struct soc_camera_file *icf = file->private_data;
372 struct soc_camera_device *icd = icf->icd; 370 struct soc_camera_device *icd = icf->icd;
@@ -385,7 +383,7 @@ static int soc_camera_enum_fmt_vid_cap(struct file *file, void *priv,
385} 383}
386 384
387static int soc_camera_g_fmt_vid_cap(struct file *file, void *priv, 385static int soc_camera_g_fmt_vid_cap(struct file *file, void *priv,
388 struct v4l2_format *f) 386 struct v4l2_format *f)
389{ 387{
390 struct soc_camera_file *icf = file->private_data; 388 struct soc_camera_file *icf = file->private_data;
391 struct soc_camera_device *icd = icf->icd; 389 struct soc_camera_device *icd = icf->icd;