1 files changed, 16 insertions, 26 deletions

diff --git a/drivers/media/dvb-frontends/stb6100_cfg.h b/drivers/media/dvb-frontends/stb6100_cfg.h
index 6314d18c797a..6edc15365847 100644
--- a/drivers/media/dvb-frontends/stb6100_cfg.h
+++ b/drivers/media/dvb-frontends/stb6100_cfg.h
@@ -21,17 +21,14 @@
 
 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) {
+                err = tuner_ops->get_state(fe, DVBFE_TUNER_FREQUENCY, &t_state);
+                if (err < 0) {
                         printk("%s: Invalid parameter\n", __func__);
                         return err;
                 }
@@ -42,18 +39,16 @@ 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) {
+                err = tuner_ops->set_state(fe, DVBFE_TUNER_FREQUENCY, &t_state);
+                if (err < 0) {
                         printk("%s: Invalid parameter\n", __func__);
                         return err;
                 }
@@ -68,12 +63,9 @@ 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) {
+                err = tuner_ops->get_state(fe, DVBFE_TUNER_BANDWIDTH, &t_state);
+                if (err < 0) {
                         printk("%s: Invalid parameter\n", __func__);
                         return err;
                 }
@@ -84,18 +76,16 @@ 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) {
+                err = tuner_ops->set_state(fe, DVBFE_TUNER_BANDWIDTH, &t_state);
+                if (err < 0) {
                         printk("%s: Invalid parameter\n", __func__);
                         return err;
                 }