AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

V4L/DVB (6444): tuner-core: remove excessive parenthesis

Browse Source 
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>
This commit is contained in:
Michael Krufky 2007-10-22 18:03:29 -03:00 committed by Mauro Carvalho Chehab
parent 31c9584c0b
commit af3b0f3f01
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/media/video/tuner-core.c
View File

@ -279,7 +279,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
} }
/* discard private data, in case set_type() was previously called */ /* discard private data, in case set_type() was previously called */
if ((ops) && (ops->release)) if (ops && ops->release)
ops->release(&t->fe); ops->release(&t->fe);
switch (t->type) { switch (t->type) {
@ -727,7 +727,7 @@ static int tuner_detach(struct i2c_client *client)
return err; return err;
} }
if ((ops) && (ops->release)) if (ops && ops->release)
ops->release(&t->fe); ops->release(&t->fe);
kfree(t); kfree(t);
@ -752,7 +752,7 @@ static inline int set_mode(struct i2c_client *client, struct tuner *t, int mode,
if (check_mode(t, cmd) == EINVAL) { if (check_mode(t, cmd) == EINVAL) {
t->mode = T_STANDBY; t->mode = T_STANDBY;
if ((ops) && (ops->standby)) if (ops && ops->standby)
ops->standby(&t->fe); ops->standby(&t->fe);
return EINVAL; return EINVAL;
} }
@ -803,7 +803,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
if (check_mode(t, "TUNER_SET_STANDBY") == EINVAL) if (check_mode(t, "TUNER_SET_STANDBY") == EINVAL)
return 0; return 0;
t->mode = T_STANDBY; t->mode = T_STANDBY;
if ((ops) && (ops->standby)) if (ops && ops->standby)
ops->standby(&t->fe); ops->standby(&t->fe);
break; break;
#ifdef CONFIG_VIDEO_V4L1 #ifdef CONFIG_VIDEO_V4L1
@ -872,7 +872,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
else else
vt->flags &= ~VIDEO_TUNER_STEREO_ON; vt->flags &= ~VIDEO_TUNER_STEREO_ON;
} else { } else {
if ((ops) && (ops->is_stereo)) { if (ops && ops->is_stereo) {
if (ops->is_stereo(&t->fe)) if (ops->is_stereo(&t->fe))
vt->flags |= vt->flags |=
VIDEO_TUNER_STEREO_ON; VIDEO_TUNER_STEREO_ON;
@ -881,7 +881,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
~VIDEO_TUNER_STEREO_ON; ~VIDEO_TUNER_STEREO_ON;
} }
} }
if ((ops) && (ops->has_signal)) if (ops && ops->has_signal)
vt->signal = ops->has_signal(&t->fe); vt->signal = ops->has_signal(&t->fe);
vt->flags |= VIDEO_TUNER_LOW; /* Allow freqs at 62.5 Hz */ 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)
fe_tuner_ops->get_status(&t->fe, &tuner_status); fe_tuner_ops->get_status(&t->fe, &tuner_status);
va->mode = (tuner_status & TUNER_STATUS_STEREO) va->mode = (tuner_status & TUNER_STATUS_STEREO)
? VIDEO_SOUND_STEREO : VIDEO_SOUND_MONO; ? VIDEO_SOUND_STEREO : VIDEO_SOUND_MONO;
} else if ((ops) && (ops->is_stereo)) } else if (ops && ops->is_stereo)
va->mode = ops->is_stereo(&t->fe) va->mode = ops->is_stereo(&t->fe)
? VIDEO_SOUND_STEREO : VIDEO_SOUND_MONO; ? VIDEO_SOUND_STEREO : VIDEO_SOUND_MONO;
} }
@ -1003,7 +1003,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
switch_v4l2(); switch_v4l2();
tuner->type = t->mode; tuner->type = t->mode;
if ((ops) && (ops->get_afc)) if (ops && ops->get_afc)
tuner->afc = ops->get_afc(&t->fe); tuner->afc = ops->get_afc(&t->fe);
if (t->mode == V4L2_TUNER_ANALOG_TV) if (t->mode == V4L2_TUNER_ANALOG_TV)
tuner->capability |= V4L2_TUNER_CAP_NORM; tuner->capability |= V4L2_TUNER_CAP_NORM;
@ -1025,14 +1025,14 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
V4L2_TUNER_SUB_STEREO : V4L2_TUNER_SUB_STEREO :
V4L2_TUNER_SUB_MONO; V4L2_TUNER_SUB_MONO;
} else { } else {
if ((ops) && (ops->is_stereo)) { if (ops && ops->is_stereo) {
tuner->rxsubchans = tuner->rxsubchans =
ops->is_stereo(&t->fe) ? ops->is_stereo(&t->fe) ?
V4L2_TUNER_SUB_STEREO : V4L2_TUNER_SUB_STEREO :
V4L2_TUNER_SUB_MONO; V4L2_TUNER_SUB_MONO;
} }
} }
if ((ops) && (ops->has_signal)) if (ops && ops->has_signal)
tuner->signal = ops->has_signal(&t->fe); tuner->signal = ops->has_signal(&t->fe);
tuner->capability |= tuner->capability |=
V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO; 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)
break; break;
} }
case VIDIOC_LOG_STATUS: case VIDIOC_LOG_STATUS:
if ((ops) && (ops->tuner_status)) if (ops && ops->tuner_status)
ops->tuner_status(&t->fe); ops->tuner_status(&t->fe);
break; break;
} }