evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] staging: rtl2832_sdr: fixup checkpatch/style issues

Browse source 
rtl2832_sdr.c: fixup checkpatch issues about long lines

Aligned stuff under the ( for this version.

Signed-off-by: Anthony DeStefano <adx@fastmail.fm>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Anthony DeStefano 2014-04-09 23:08:49 -03:00 • committed by Mauro Carvalho Chehab
parent e7d40c3721
commit 85594960f5
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c
View file

@ -935,7 +935,8 @@ static int rtl2832_sdr_set_tuner_freq(struct rtl2832_sdr_state *s)
/* /*
* bandwidth (Hz) * bandwidth (Hz)
*/ */
bandwidth_auto = v4l2_ctrl_find(&s->hdl, V4L2_CID_RF_TUNER_BANDWIDTH_AUTO); bandwidth_auto = v4l2_ctrl_find(&s->hdl,
V4L2_CID_RF_TUNER_BANDWIDTH_AUTO);
bandwidth = v4l2_ctrl_find(&s->hdl, V4L2_CID_RF_TUNER_BANDWIDTH); bandwidth = v4l2_ctrl_find(&s->hdl, V4L2_CID_RF_TUNER_BANDWIDTH);
if (v4l2_ctrl_g_ctrl(bandwidth_auto)) { if (v4l2_ctrl_g_ctrl(bandwidth_auto)) {
c->bandwidth_hz = s->f_adc; c->bandwidth_hz = s->f_adc;
@ -1329,9 +1330,11 @@ static int rtl2832_sdr_s_ctrl(struct v4l2_ctrl *ctrl)
/* Round towards the closest legal value */ /* Round towards the closest legal value */
s32 val = s->f_adc + s->bandwidth->step / 2; s32 val = s->f_adc + s->bandwidth->step / 2;
u32 offset; u32 offset;
val = clamp(val, s->bandwidth->minimum, s->bandwidth->maximum); val = clamp(val, s->bandwidth->minimum,
s->bandwidth->maximum);
offset = val - s->bandwidth->minimum; offset = val - s->bandwidth->minimum;
offset = s->bandwidth->step * (offset / s->bandwidth->step); offset = s->bandwidth->step *
(offset / s->bandwidth->step);
s->bandwidth->val = s->bandwidth->minimum + offset; s->bandwidth->val = s->bandwidth->minimum + offset;
} }
@ -1420,15 +1423,24 @@ struct dvb_frontend *rtl2832_sdr_attach(struct dvb_frontend *fe,
break; break;
case RTL2832_TUNER_R820T: case RTL2832_TUNER_R820T:
v4l2_ctrl_handler_init(&s->hdl, 2); v4l2_ctrl_handler_init(&s->hdl, 2);
s->bandwidth_auto = v4l2_ctrl_new_std(&s->hdl, ops, V4L2_CID_RF_TUNER_BANDWIDTH_AUTO, 0, 1, 1, 1); s->bandwidth_auto = v4l2_ctrl_new_std(&s->hdl, ops,
s->bandwidth = v4l2_ctrl_new_std(&s->hdl, ops, V4L2_CID_RF_TUNER_BANDWIDTH, 0, 8000000, 100000, 0); V4L2_CID_RF_TUNER_BANDWIDTH_AUTO,
0, 1, 1, 1);
s->bandwidth = v4l2_ctrl_new_std(&s->hdl, ops,
V4L2_CID_RF_TUNER_BANDWIDTH,
0, 8000000, 100000, 0);
v4l2_ctrl_auto_cluster(2, &s->bandwidth_auto, 0, false); v4l2_ctrl_auto_cluster(2, &s->bandwidth_auto, 0, false);
break; break;
case RTL2832_TUNER_FC0012: case RTL2832_TUNER_FC0012:
case RTL2832_TUNER_FC0013: case RTL2832_TUNER_FC0013:
v4l2_ctrl_handler_init(&s->hdl, 2); v4l2_ctrl_handler_init(&s->hdl, 2);
s->bandwidth_auto = v4l2_ctrl_new_std(&s->hdl, ops, V4L2_CID_RF_TUNER_BANDWIDTH_AUTO, 0, 1, 1, 1); s->bandwidth_auto = v4l2_ctrl_new_std(&s->hdl, ops,
s->bandwidth = v4l2_ctrl_new_std(&s->hdl, ops, V4L2_CID_RF_TUNER_BANDWIDTH, 6000000, 8000000, 1000000, 6000000); V4L2_CID_RF_TUNER_BANDWIDTH_AUTO,
0, 1, 1, 1);
s->bandwidth = v4l2_ctrl_new_std(&s->hdl, ops,
V4L2_CID_RF_TUNER_BANDWIDTH,
6000000, 8000000, 1000000,
6000000);
v4l2_ctrl_auto_cluster(2, &s->bandwidth_auto, 0, false); v4l2_ctrl_auto_cluster(2, &s->bandwidth_auto, 0, false);
break; break;
default: default: