aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tuner-core.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2007-10-22 17:03:29 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 16:01:10 -0500
commitaf3b0f3f01d299c46837a408e1b9510b8c304e43 (patch)
treeb34d302403426af069b155f444b599ec138875ff /drivers/media/video/tuner-core.c
parent31c9584c0b071dfa7a75db6e21cc727f728f97b0 (diff)
V4L/DVB (6444): tuner-core: remove excessive parenthesis
Convert all instances of "if ((ops) && (ops->foo))" to "if (ops && ops->foo)" Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/tuner-core.c')
-rw-r--r--drivers/media/video/tuner-core.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index da16bf998fbe..1e9c9755dec2 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -279,7 +279,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
279 } 279 }
280 280
281 /* discard private data, in case set_type() was previously called */ 281 /* discard private data, in case set_type() was previously called */
282 if ((ops) && (ops->release)) 282 if (ops && ops->release)
283 ops->release(&t->fe); 283 ops->release(&t->fe);
284 284
285 switch (t->type) { 285 switch (t->type) {
@@ -727,7 +727,7 @@ static int tuner_detach(struct i2c_client *client)
727 return err; 727 return err;
728 } 728 }
729 729
730 if ((ops) && (ops->release)) 730 if (ops && ops->release)
731 ops->release(&t->fe); 731 ops->release(&t->fe);
732 732
733 kfree(t); 733 kfree(t);
@@ -752,7 +752,7 @@ static inline int set_mode(struct i2c_client *client, struct tuner *t, int mode,
752 752
753 if (check_mode(t, cmd) == EINVAL) { 753 if (check_mode(t, cmd) == EINVAL) {
754 t->mode = T_STANDBY; 754 t->mode = T_STANDBY;
755 if ((ops) && (ops->standby)) 755 if (ops && ops->standby)
756 ops->standby(&t->fe); 756 ops->standby(&t->fe);
757 return EINVAL; 757 return EINVAL;
758 } 758 }
@@ -803,7 +803,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
803 if (check_mode(t, "TUNER_SET_STANDBY") == EINVAL) 803 if (check_mode(t, "TUNER_SET_STANDBY") == EINVAL)
804 return 0; 804 return 0;
805 t->mode = T_STANDBY; 805 t->mode = T_STANDBY;
806 if ((ops) && (ops->standby)) 806 if (ops && ops->standby)
807 ops->standby(&t->fe); 807 ops->standby(&t->fe);
808 break; 808 break;
809#ifdef CONFIG_VIDEO_V4L1 809#ifdef CONFIG_VIDEO_V4L1
@@ -872,7 +872,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
872 else 872 else
873 vt->flags &= ~VIDEO_TUNER_STEREO_ON; 873 vt->flags &= ~VIDEO_TUNER_STEREO_ON;
874 } else { 874 } else {
875 if ((ops) && (ops->is_stereo)) { 875 if (ops && ops->is_stereo) {
876 if (ops->is_stereo(&t->fe)) 876 if (ops->is_stereo(&t->fe))
877 vt->flags |= 877 vt->flags |=
878 VIDEO_TUNER_STEREO_ON; 878 VIDEO_TUNER_STEREO_ON;
@@ -881,7 +881,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
881 ~VIDEO_TUNER_STEREO_ON; 881 ~VIDEO_TUNER_STEREO_ON;
882 } 882 }
883 } 883 }
884 if ((ops) && (ops->has_signal)) 884 if (ops && ops->has_signal)
885 vt->signal = ops->has_signal(&t->fe); 885 vt->signal = ops->has_signal(&t->fe);
886 886
887 vt->flags |= VIDEO_TUNER_LOW; /* Allow freqs at 62.5 Hz */ 887 vt->flags |= VIDEO_TUNER_LOW; /* Allow freqs at 62.5 Hz */
@@ -912,7 +912,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
912 fe_tuner_ops->get_status(&t->fe, &tuner_status); 912 fe_tuner_ops->get_status(&t->fe, &tuner_status);
913 va->mode = (tuner_status & TUNER_STATUS_STEREO) 913 va->mode = (tuner_status & TUNER_STATUS_STEREO)
914 ? VIDEO_SOUND_STEREO : VIDEO_SOUND_MONO; 914 ? VIDEO_SOUND_STEREO : VIDEO_SOUND_MONO;
915 } else if ((ops) && (ops->is_stereo)) 915 } else if (ops && ops->is_stereo)
916 va->mode = ops->is_stereo(&t->fe) 916 va->mode = ops->is_stereo(&t->fe)
917 ? VIDEO_SOUND_STEREO : VIDEO_SOUND_MONO; 917 ? VIDEO_SOUND_STEREO : VIDEO_SOUND_MONO;
918 } 918 }
@@ -1003,7 +1003,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
1003 switch_v4l2(); 1003 switch_v4l2();
1004 1004
1005 tuner->type = t->mode; 1005 tuner->type = t->mode;
1006 if ((ops) && (ops->get_afc)) 1006 if (ops && ops->get_afc)
1007 tuner->afc = ops->get_afc(&t->fe); 1007 tuner->afc = ops->get_afc(&t->fe);
1008 if (t->mode == V4L2_TUNER_ANALOG_TV) 1008 if (t->mode == V4L2_TUNER_ANALOG_TV)
1009 tuner->capability |= V4L2_TUNER_CAP_NORM; 1009 tuner->capability |= V4L2_TUNER_CAP_NORM;
@@ -1025,14 +1025,14 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
1025 V4L2_TUNER_SUB_STEREO : 1025 V4L2_TUNER_SUB_STEREO :
1026 V4L2_TUNER_SUB_MONO; 1026 V4L2_TUNER_SUB_MONO;
1027 } else { 1027 } else {
1028 if ((ops) && (ops->is_stereo)) { 1028 if (ops && ops->is_stereo) {
1029 tuner->rxsubchans = 1029 tuner->rxsubchans =
1030 ops->is_stereo(&t->fe) ? 1030 ops->is_stereo(&t->fe) ?
1031 V4L2_TUNER_SUB_STEREO : 1031 V4L2_TUNER_SUB_STEREO :
1032 V4L2_TUNER_SUB_MONO; 1032 V4L2_TUNER_SUB_MONO;
1033 } 1033 }
1034 } 1034 }
1035 if ((ops) && (ops->has_signal)) 1035 if (ops && ops->has_signal)
1036 tuner->signal = ops->has_signal(&t->fe); 1036 tuner->signal = ops->has_signal(&t->fe);
1037 tuner->capability |= 1037 tuner->capability |=
1038 V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO; 1038 V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO;
@@ -1058,7 +1058,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
1058 break; 1058 break;
1059 } 1059 }
1060 case VIDIOC_LOG_STATUS: 1060 case VIDIOC_LOG_STATUS:
1061 if ((ops) && (ops->tuner_status)) 1061 if (ops && ops->tuner_status)
1062 ops->tuner_status(&t->fe); 1062 ops->tuner_status(&t->fe);
1063 break; 1063 break;
1064 } 1064 }