summaryrefslogtreecommitdiff
path: root/drivers/staging/cx25821/cx25821-video.c
diff options
context:
space:
mode:
authorLeonid V. Fedorenchik <leonidsbox@gmail.com>2011-09-16 06:14:59 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2011-09-16 18:45:44 (GMT)
commit70e7f145e416dfe0ce8c38e77d8a5280f08eda7f (patch)
tree845cdfd4276dc2fb452dff4d6faeaf40300fbbd1 /drivers/staging/cx25821/cx25821-video.c
parentf9a8150c924c9793ee6cd52cce663756bae27314 (diff)
downloadlinux-fsl-qoriq-70e7f145e416dfe0ce8c38e77d8a5280f08eda7f.tar.xz
Staging: cx25821: Change indent with spaces to tabs 22
Change indent with spaces to tabs. Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/cx25821/cx25821-video.c')
-rw-r--r--drivers/staging/cx25821/cx25821-video.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/staging/cx25821/cx25821-video.c b/drivers/staging/cx25821/cx25821-video.c
index 709fe3d..4cea791 100644
--- a/drivers/staging/cx25821/cx25821-video.c
+++ b/drivers/staging/cx25821/cx25821-video.c
@@ -1208,9 +1208,9 @@ int cx25821_vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *p)
int cx25821_vidioc_g_priority(struct file *file, void *f, enum v4l2_priority *p)
{
struct cx25821_dev *dev = ((struct cx25821_fh *)f)->dev;
- struct cx25821_fh *fh = f;
+ struct cx25821_fh *fh = f;
- *p = v4l2_prio_max(&dev->channels[fh->channel_id].prio);
+ *p = v4l2_prio_max(&dev->channels[fh->channel_id].prio);
return 0;
}
@@ -1221,8 +1221,8 @@ int cx25821_vidioc_s_priority(struct file *file, void *f,
struct cx25821_fh *fh = f;
struct cx25821_dev *dev = ((struct cx25821_fh *)f)->dev;
- return v4l2_prio_change(&dev->channels[fh->channel_id]
- .prio, &fh->prio, prio);
+ return v4l2_prio_change(&dev->channels[fh->channel_id].prio, &fh->prio,
+ prio);
}
#ifdef TUNER_FLAG
@@ -1235,15 +1235,14 @@ int cx25821_vidioc_s_std(struct file *file, void *priv, v4l2_std_id * tvnorms)
dprintk(1, "%s()\n", __func__);
if (fh) {
- err = v4l2_prio_check(&dev->channels[fh->channel_id]
- .prio, fh->prio);
+ err = v4l2_prio_check(&dev->channels[fh->channel_id].prio,
+ fh->prio);
if (0 != err)
return err;
}
- if (dev->tvnorm == *tvnorms) {
+ if (dev->tvnorm == *tvnorms)
return 0;
- }
mutex_lock(&dev->lock);
cx25821_set_tvnorm(dev, *tvnorms);
@@ -1257,7 +1256,7 @@ int cx25821_vidioc_s_std(struct file *file, void *priv, v4l2_std_id * tvnorms)
int cx25821_enum_input(struct cx25821_dev *dev, struct v4l2_input *i)
{
- static const char *iname[] = {
+ static const char * const iname[] = {
[CX25821_VMUX_COMPOSITE] = "Composite",
[CX25821_VMUX_SVIDEO] = "S-Video",
[CX25821_VMUX_DEBUG] = "for debug only",
@@ -1305,8 +1304,8 @@ int cx25821_vidioc_s_input(struct file *file, void *priv, unsigned int i)
dprintk(1, "%s(%d)\n", __func__, i);
if (fh) {
- err = v4l2_prio_check(&dev->channels[fh->channel_id]
- .prio, fh->prio);
+ err = v4l2_prio_check(&dev->channels[fh->channel_id].prio,
+ fh->prio);
if (0 != err)
return err;
}