[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: Emil Goode <emilgoode@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/dvb-frontends/stb6100_cfg.h b/drivers/media/dvb-frontends/stb6100_cfg.h
index 6314d18c797a49ba95ee278ea70149194e97312c..0e10ad89d1f16696b934a1a7e8f79a3dd4ebed22 100644 (file)
--- a/drivers/media/dvb-frontends/stb6100_cfg.h
+++ b/drivers/media/dvb-frontends/stb6100_cfg.h
@@ -21,15 +21,11 @@
 
 static int stb6100_get_frequency(struct dvb_frontend *fe, u32 *frequency)
 {
-       struct dvb_frontend_ops *frontend_ops = NULL;
-       struct dvb_tuner_ops    *tuner_ops = NULL;
+       struct dvb_frontend_ops *frontend_ops = &fe->ops;
+       struct dvb_tuner_ops    *tuner_ops = &frontend_ops->tuner_ops;
        struct tuner_state      t_state;
        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 ((err = tuner_ops->get_state(fe, DVBFE_TUNER_FREQUENCY, &t_state)) < 0) {
                        printk("%s: Invalid parameter\n", __func__);
@@ -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)
 {
-       struct dvb_frontend_ops *frontend_ops = NULL;
-       struct dvb_tuner_ops    *tuner_ops = NULL;
+       struct dvb_frontend_ops *frontend_ops = &fe->ops;
+       struct dvb_tuner_ops    *tuner_ops = &frontend_ops->tuner_ops;
        struct tuner_state      t_state;
        int err = 0;
 
        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 ((err = tuner_ops->set_state(fe, DVBFE_TUNER_FREQUENCY, &t_state)) < 0) {
                        printk("%s: Invalid parameter\n", __func__);
@@ -68,10 +61,6 @@ static int stb6100_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
        struct tuner_state      t_state;
        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 ((err = tuner_ops->get_state(fe, DVBFE_TUNER_BANDWIDTH, &t_state)) < 0) {
                        printk("%s: Invalid parameter\n", __func__);
@@ -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)
 {
-       struct dvb_frontend_ops *frontend_ops = NULL;
-       struct dvb_tuner_ops    *tuner_ops = NULL;
+       struct dvb_frontend_ops *frontend_ops = &fe->ops;
+       struct dvb_tuner_ops    *tuner_ops = &frontend_ops->tuner_ops;
        struct tuner_state      t_state;
        int err = 0;
 
        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 ((err = tuner_ops->set_state(fe, DVBFE_TUNER_BANDWIDTH, &t_state)) < 0) {
                        printk("%s: Invalid parameter\n", __func__);

diff --git a/drivers/media/dvb-frontends/stb6100_proc.h b/drivers/media/dvb-frontends/stb6100_proc.h
index 112163a486223baf02471984e2652aad00c165a3..bd8a0ec9e2cce19cb35813f761c1c03a7fa338ed 100644 (file)
--- a/drivers/media/dvb-frontends/stb6100_proc.h
+++ b/drivers/media/dvb-frontends/stb6100_proc.h
@@ -19,15 +19,11 @@
 
 static int stb6100_get_freq(struct dvb_frontend *fe, u32 *frequency)
 {
-       struct dvb_frontend_ops *frontend_ops = NULL;
-       struct dvb_tuner_ops    *tuner_ops = NULL;
+       struct dvb_frontend_ops *frontend_ops = &fe->ops;
+       struct dvb_tuner_ops    *tuner_ops = &frontend_ops->tuner_ops;
        struct tuner_state      state;
        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 (frontend_ops->i2c_gate_ctrl)
                        frontend_ops->i2c_gate_ctrl(fe, 1);
@@ -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)
 {
-       struct dvb_frontend_ops *frontend_ops = NULL;
-       struct dvb_tuner_ops    *tuner_ops = NULL;
+       struct dvb_frontend_ops *frontend_ops = &fe->ops;
+       struct dvb_tuner_ops    *tuner_ops = &frontend_ops->tuner_ops;
        struct tuner_state      state;
        int err = 0;
 
        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 (frontend_ops->i2c_gate_ctrl)
                        frontend_ops->i2c_gate_ctrl(fe, 1);
@@ -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)
 {
-       struct dvb_frontend_ops *frontend_ops = NULL;
-       struct dvb_tuner_ops    *tuner_ops = NULL;
+       struct dvb_frontend_ops *frontend_ops = &fe->ops;
+       struct dvb_tuner_ops    *tuner_ops = &frontend_ops->tuner_ops;
        struct tuner_state      state;
        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 (frontend_ops->i2c_gate_ctrl)
                        frontend_ops->i2c_gate_ctrl(fe, 1);
@@ -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)
 {
-       struct dvb_frontend_ops *frontend_ops = NULL;
-       struct dvb_tuner_ops    *tuner_ops = NULL;
+       struct dvb_frontend_ops *frontend_ops = &fe->ops;
+       struct dvb_tuner_ops    *tuner_ops = &frontend_ops->tuner_ops;
        struct tuner_state      state;
        int err = 0;
 
        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 (frontend_ops->i2c_gate_ctrl)
                        frontend_ops->i2c_gate_ctrl(fe, 1);

diff --git a/drivers/media/dvb-frontends/stv0367.c b/drivers/media/dvb-frontends/stv0367.c
index 458772739423234388c50940bccbae9c3bb63bb6..59b6e661acc085bd99e6c11ff8dc8f58c88de35f 100644 (file)
--- a/drivers/media/dvb-frontends/stv0367.c
+++ b/drivers/media/dvb-frontends/stv0367.c
@@ -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)
 {
-       struct dvb_frontend_ops *frontend_ops = NULL;
-       struct dvb_tuner_ops    *tuner_ops = NULL;
+       struct dvb_frontend_ops *frontend_ops = &fe->ops;
+       struct dvb_tuner_ops    *tuner_ops = &frontend_ops->tuner_ops;
        u32 freq = 0;
        int err = 0;
 
        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) {
                err = tuner_ops->get_frequency(fe, &freq);
                if (err < 0) {

diff --git a/drivers/media/dvb-frontends/tda8261_cfg.h b/drivers/media/dvb-frontends/tda8261_cfg.h
index 46710744173beac68dc7998608876c8801c2e4d6..7de65c302e08df1fac397eca1ad3d586e5f11fb8 100644 (file)
--- a/drivers/media/dvb-frontends/tda8261_cfg.h
+++ b/drivers/media/dvb-frontends/tda8261_cfg.h
@@ -19,15 +19,11 @@
 
 static int tda8261_get_frequency(struct dvb_frontend *fe, u32 *frequency)
 {
-       struct dvb_frontend_ops *frontend_ops = NULL;
-       struct dvb_tuner_ops    *tuner_ops = NULL;
+       struct dvb_frontend_ops *frontend_ops = &fe->ops;
+       struct dvb_tuner_ops    *tuner_ops = &frontend_ops->tuner_ops;
        struct tuner_state      t_state;
        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 ((err = tuner_ops->get_state(fe, DVBFE_TUNER_FREQUENCY, &t_state)) < 0) {
                        printk("%s: Invalid parameter\n", __func__);
@@ -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)
 {
-       struct dvb_frontend_ops *frontend_ops = NULL;
-       struct dvb_tuner_ops    *tuner_ops = NULL;
+       struct dvb_frontend_ops *frontend_ops = &fe->ops;
+       struct dvb_tuner_ops    *tuner_ops = &frontend_ops->tuner_ops;
        struct tuner_state      t_state;
        int err = 0;
 
        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 ((err = tuner_ops->set_state(fe, DVBFE_TUNER_FREQUENCY, &t_state)) < 0) {
                        printk("%s: Invalid parameter\n", __func__);
@@ -68,10 +61,6 @@ static int tda8261_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
        struct tuner_state      t_state;
        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 ((err = tuner_ops->get_state(fe, DVBFE_TUNER_BANDWIDTH, &t_state)) < 0) {
                        printk("%s: Invalid parameter\n", __func__);