Skip to content

L
linux
Commit 20721185 authored by Emil Goode's avatar Emil Goode Committed by Mauro Carvalho Chehab
Browse files
Options

[media] Remove checks of struct member addresses 

This removes checks of struct member addresses since they likely result
in the condition always being true. Also in the stb6100_get_bandwidth
and tda8261_get_bandwidth functions the pointers frontend_ops and
tuner_ops are assigned the same addresses twice.
Signed-off-by: default avatarEmil Goode <emilgoode@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 18d75a09
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 69 deletions
drivers/media/dvb-frontends/stb6100_cfg.h
View file @ 20721185
...@@ -21,15 +21,11 @@ ...@@ -21,15 +21,11 @@
static int stb6100_get_frequency(struct dvb_frontend *fe, u32 *frequency) static int stb6100_get_frequency(struct dvb_frontend *fe, u32 *frequency)
{ {
struct dvb_frontend_ops *frontend_ops = NULL; struct dvb_frontend_ops *frontend_ops = &fe->ops;
struct dvb_tuner_ops *tuner_ops = NULL; struct dvb_tuner_ops *tuner_ops = &frontend_ops->tuner_ops;
struct tuner_state t_state; struct tuner_state t_state;
int err = 0; int err = 0;
if (&fe->ops)
frontend_ops = &fe->ops;
if (&frontend_ops->tuner_ops)
tuner_ops = &frontend_ops->tuner_ops;
if (tuner_ops->get_state) { if (tuner_ops->get_state) {
if ((err = tuner_ops->get_state(fe, DVBFE_TUNER_FREQUENCY, &t_state)) < 0) { if ((err = tuner_ops->get_state(fe, DVBFE_TUNER_FREQUENCY, &t_state)) < 0) {
printk("%s: Invalid parameter\n", __func__); printk("%s: Invalid parameter\n", __func__);
...@@ -42,16 +38,13 @@ static int stb6100_get_frequency(struct dvb_frontend *fe, u32 *frequency) ...@@ -42,16 +38,13 @@ static int stb6100_get_frequency(struct dvb_frontend *fe, u32 *frequency)
static int stb6100_set_frequency(struct dvb_frontend *fe, u32 frequency) static int stb6100_set_frequency(struct dvb_frontend *fe, u32 frequency)
{ {
struct dvb_frontend_ops *frontend_ops = NULL; struct dvb_frontend_ops *frontend_ops = &fe->ops;
struct dvb_tuner_ops *tuner_ops = NULL; struct dvb_tuner_ops *tuner_ops = &frontend_ops->tuner_ops;
struct tuner_state t_state; struct tuner_state t_state;
int err = 0; int err = 0;
t_state.frequency = frequency; t_state.frequency = frequency;
if (&fe->ops)
frontend_ops = &fe->ops;
if (&frontend_ops->tuner_ops)
tuner_ops = &frontend_ops->tuner_ops;
if (tuner_ops->set_state) { if (tuner_ops->set_state) {
if ((err = tuner_ops->set_state(fe, DVBFE_TUNER_FREQUENCY, &t_state)) < 0) { if ((err = tuner_ops->set_state(fe, DVBFE_TUNER_FREQUENCY, &t_state)) < 0) {
printk("%s: Invalid parameter\n", __func__); printk("%s: Invalid parameter\n", __func__);
...@@ -68,10 +61,6 @@ static int stb6100_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth) ...@@ -68,10 +61,6 @@ static int stb6100_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
struct tuner_state t_state; struct tuner_state t_state;
int err = 0; int err = 0;
if (&fe->ops)
frontend_ops = &fe->ops;
if (&frontend_ops->tuner_ops)
tuner_ops = &frontend_ops->tuner_ops;
if (tuner_ops->get_state) { if (tuner_ops->get_state) {
if ((err = tuner_ops->get_state(fe, DVBFE_TUNER_BANDWIDTH, &t_state)) < 0) { if ((err = tuner_ops->get_state(fe, DVBFE_TUNER_BANDWIDTH, &t_state)) < 0) {
printk("%s: Invalid parameter\n", __func__); printk("%s: Invalid parameter\n", __func__);
...@@ -84,16 +73,13 @@ static int stb6100_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth) ...@@ -84,16 +73,13 @@ static int stb6100_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
static int stb6100_set_bandwidth(struct dvb_frontend *fe, u32 bandwidth) static int stb6100_set_bandwidth(struct dvb_frontend *fe, u32 bandwidth)
{ {
struct dvb_frontend_ops *frontend_ops = NULL; struct dvb_frontend_ops *frontend_ops = &fe->ops;
struct dvb_tuner_ops *tuner_ops = NULL; struct dvb_tuner_ops *tuner_ops = &frontend_ops->tuner_ops;
struct tuner_state t_state; struct tuner_state t_state;
int err = 0; int err = 0;
t_state.bandwidth = bandwidth; t_state.bandwidth = bandwidth;
if (&fe->ops)
frontend_ops = &fe->ops;
if (&frontend_ops->tuner_ops)
tuner_ops = &frontend_ops->tuner_ops;
if (tuner_ops->set_state) { if (tuner_ops->set_state) {
if ((err = tuner_ops->set_state(fe, DVBFE_TUNER_BANDWIDTH, &t_state)) < 0) { if ((err = tuner_ops->set_state(fe, DVBFE_TUNER_BANDWIDTH, &t_state)) < 0) {
printk("%s: Invalid parameter\n", __func__); printk("%s: Invalid parameter\n", __func__);
......
drivers/media/dvb-frontends/stb6100_proc.h
View file @ 20721185
...@@ -19,15 +19,11 @@ ...@@ -19,15 +19,11 @@
static int stb6100_get_freq(struct dvb_frontend *fe, u32 *frequency) static int stb6100_get_freq(struct dvb_frontend *fe, u32 *frequency)
{ {
struct dvb_frontend_ops *frontend_ops = NULL; struct dvb_frontend_ops *frontend_ops = &fe->ops;
struct dvb_tuner_ops *tuner_ops = NULL; struct dvb_tuner_ops *tuner_ops = &frontend_ops->tuner_ops;
struct tuner_state state; struct tuner_state state;
int err = 0; int err = 0;
if (&fe->ops)
frontend_ops = &fe->ops;
if (&frontend_ops->tuner_ops)
tuner_ops = &frontend_ops->tuner_ops;
if (tuner_ops->get_state) { if (tuner_ops->get_state) {
if (frontend_ops->i2c_gate_ctrl) if (frontend_ops->i2c_gate_ctrl)
frontend_ops->i2c_gate_ctrl(fe, 1); frontend_ops->i2c_gate_ctrl(fe, 1);
...@@ -49,16 +45,13 @@ static int stb6100_get_freq(struct dvb_frontend *fe, u32 *frequency) ...@@ -49,16 +45,13 @@ static int stb6100_get_freq(struct dvb_frontend *fe, u32 *frequency)
static int stb6100_set_freq(struct dvb_frontend *fe, u32 frequency) static int stb6100_set_freq(struct dvb_frontend *fe, u32 frequency)
{ {
struct dvb_frontend_ops *frontend_ops = NULL; struct dvb_frontend_ops *frontend_ops = &fe->ops;
struct dvb_tuner_ops *tuner_ops = NULL; struct dvb_tuner_ops *tuner_ops = &frontend_ops->tuner_ops;
struct tuner_state state; struct tuner_state state;
int err = 0; int err = 0;
state.frequency = frequency; state.frequency = frequency;
if (&fe->ops)
frontend_ops = &fe->ops;
if (&frontend_ops->tuner_ops)
tuner_ops = &frontend_ops->tuner_ops;
if (tuner_ops->set_state) { if (tuner_ops->set_state) {
if (frontend_ops->i2c_gate_ctrl) if (frontend_ops->i2c_gate_ctrl)
frontend_ops->i2c_gate_ctrl(fe, 1); frontend_ops->i2c_gate_ctrl(fe, 1);
...@@ -79,15 +72,11 @@ static int stb6100_set_freq(struct dvb_frontend *fe, u32 frequency) ...@@ -79,15 +72,11 @@ static int stb6100_set_freq(struct dvb_frontend *fe, u32 frequency)
static int stb6100_get_bandw(struct dvb_frontend *fe, u32 *bandwidth) static int stb6100_get_bandw(struct dvb_frontend *fe, u32 *bandwidth)
{ {
struct dvb_frontend_ops *frontend_ops = NULL; struct dvb_frontend_ops *frontend_ops = &fe->ops;
struct dvb_tuner_ops *tuner_ops = NULL; struct dvb_tuner_ops *tuner_ops = &frontend_ops->tuner_ops;
struct tuner_state state; struct tuner_state state;
int err = 0; int err = 0;
if (&fe->ops)
frontend_ops = &fe->ops;
if (&frontend_ops->tuner_ops)
tuner_ops = &frontend_ops->tuner_ops;
if (tuner_ops->get_state) { if (tuner_ops->get_state) {
if (frontend_ops->i2c_gate_ctrl) if (frontend_ops->i2c_gate_ctrl)
frontend_ops->i2c_gate_ctrl(fe, 1); frontend_ops->i2c_gate_ctrl(fe, 1);
...@@ -109,16 +98,13 @@ static int stb6100_get_bandw(struct dvb_frontend *fe, u32 *bandwidth) ...@@ -109,16 +98,13 @@ static int stb6100_get_bandw(struct dvb_frontend *fe, u32 *bandwidth)
static int stb6100_set_bandw(struct dvb_frontend *fe, u32 bandwidth) static int stb6100_set_bandw(struct dvb_frontend *fe, u32 bandwidth)
{ {
struct dvb_frontend_ops *frontend_ops = NULL; struct dvb_frontend_ops *frontend_ops = &fe->ops;
struct dvb_tuner_ops *tuner_ops = NULL; struct dvb_tuner_ops *tuner_ops = &frontend_ops->tuner_ops;
struct tuner_state state; struct tuner_state state;
int err = 0; int err = 0;
state.bandwidth = bandwidth; state.bandwidth = bandwidth;
if (&fe->ops)
frontend_ops = &fe->ops;
if (&frontend_ops->tuner_ops)
tuner_ops = &frontend_ops->tuner_ops;
if (tuner_ops->set_state) { if (tuner_ops->set_state) {
if (frontend_ops->i2c_gate_ctrl) if (frontend_ops->i2c_gate_ctrl)
frontend_ops->i2c_gate_ctrl(fe, 1); frontend_ops->i2c_gate_ctrl(fe, 1);
......
drivers/media/dvb-frontends/stv0367.c
View file @ 20721185
...@@ -922,18 +922,13 @@ static int stv0367ter_gate_ctrl(struct dvb_frontend *fe, int enable) ...@@ -922,18 +922,13 @@ static int stv0367ter_gate_ctrl(struct dvb_frontend *fe, int enable)
static u32 stv0367_get_tuner_freq(struct dvb_frontend *fe) static u32 stv0367_get_tuner_freq(struct dvb_frontend *fe)
{ {
struct dvb_frontend_ops *frontend_ops = NULL; struct dvb_frontend_ops *frontend_ops = &fe->ops;
struct dvb_tuner_ops *tuner_ops = NULL; struct dvb_tuner_ops *tuner_ops = &frontend_ops->tuner_ops;
u32 freq = 0; u32 freq = 0;
int err = 0; int err = 0;
dprintk("%s:\n", __func__); dprintk("%s:\n", __func__);
if (&fe->ops)
frontend_ops = &fe->ops;
if (&frontend_ops->tuner_ops)
tuner_ops = &frontend_ops->tuner_ops;
if (tuner_ops->get_frequency) { if (tuner_ops->get_frequency) {
err = tuner_ops->get_frequency(fe, &freq); err = tuner_ops->get_frequency(fe, &freq);
if (err < 0) { if (err < 0) {
......
drivers/media/dvb-frontends/tda8261_cfg.h
View file @ 20721185
...@@ -19,15 +19,11 @@ ...@@ -19,15 +19,11 @@
static int tda8261_get_frequency(struct dvb_frontend *fe, u32 *frequency) static int tda8261_get_frequency(struct dvb_frontend *fe, u32 *frequency)
{ {
struct dvb_frontend_ops *frontend_ops = NULL; struct dvb_frontend_ops *frontend_ops = &fe->ops;
struct dvb_tuner_ops *tuner_ops = NULL; struct dvb_tuner_ops *tuner_ops = &frontend_ops->tuner_ops;
struct tuner_state t_state; struct tuner_state t_state;
int err = 0; int err = 0;
if (&fe->ops)
frontend_ops = &fe->ops;
if (&frontend_ops->tuner_ops)
tuner_ops = &frontend_ops->tuner_ops;
if (tuner_ops->get_state) { if (tuner_ops->get_state) {
if ((err = tuner_ops->get_state(fe, DVBFE_TUNER_FREQUENCY, &t_state)) < 0) { if ((err = tuner_ops->get_state(fe, DVBFE_TUNER_FREQUENCY, &t_state)) < 0) {
printk("%s: Invalid parameter\n", __func__); printk("%s: Invalid parameter\n", __func__);
...@@ -41,16 +37,13 @@ static int tda8261_get_frequency(struct dvb_frontend *fe, u32 *frequency) ...@@ -41,16 +37,13 @@ static int tda8261_get_frequency(struct dvb_frontend *fe, u32 *frequency)
static int tda8261_set_frequency(struct dvb_frontend *fe, u32 frequency) static int tda8261_set_frequency(struct dvb_frontend *fe, u32 frequency)
{ {
struct dvb_frontend_ops *frontend_ops = NULL; struct dvb_frontend_ops *frontend_ops = &fe->ops;
struct dvb_tuner_ops *tuner_ops = NULL; struct dvb_tuner_ops *tuner_ops = &frontend_ops->tuner_ops;
struct tuner_state t_state; struct tuner_state t_state;
int err = 0; int err = 0;
t_state.frequency = frequency; t_state.frequency = frequency;
if (&fe->ops)
frontend_ops = &fe->ops;
if (&frontend_ops->tuner_ops)
tuner_ops = &frontend_ops->tuner_ops;
if (tuner_ops->set_state) { if (tuner_ops->set_state) {
if ((err = tuner_ops->set_state(fe, DVBFE_TUNER_FREQUENCY, &t_state)) < 0) { if ((err = tuner_ops->set_state(fe, DVBFE_TUNER_FREQUENCY, &t_state)) < 0) {
printk("%s: Invalid parameter\n", __func__); printk("%s: Invalid parameter\n", __func__);
...@@ -68,10 +61,6 @@ static int tda8261_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth) ...@@ -68,10 +61,6 @@ static int tda8261_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
struct tuner_state t_state; struct tuner_state t_state;
int err = 0; int err = 0;
if (&fe->ops)
frontend_ops = &fe->ops;
if (&frontend_ops->tuner_ops)
tuner_ops = &frontend_ops->tuner_ops;
if (tuner_ops->get_state) { if (tuner_ops->get_state) {
if ((err = tuner_ops->get_state(fe, DVBFE_TUNER_BANDWIDTH, &t_state)) < 0) { if ((err = tuner_ops->get_state(fe, DVBFE_TUNER_BANDWIDTH, &t_state)) < 0) {
printk("%s: Invalid parameter\n", __func__); printk("%s: Invalid parameter\n", __func__);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7