Merge tag 'regulator-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[cascardo/linux.git] / drivers / media / dvb-frontends / stb6100_proc.h

diff --git a/drivers/media/dvb-frontends/stb6100_proc.h b/drivers/media/dvb-frontends/stb6100_proc.h
index bd8a0ec..50ffa21 100644 (file)
--- a/drivers/media/dvb-frontends/stb6100_proc.h
+++ b/drivers/media/dvb-frontends/stb6100_proc.h
@@ -17,27 +17,27 @@
        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <linux/dvb/frontend.h>
+#include "dvb_frontend.h"
+
 static int stb6100_get_freq(struct dvb_frontend *fe, u32 *frequency)
 {
        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 (tuner_ops->get_state) {
+       if (tuner_ops->get_frequency) {
                if (frontend_ops->i2c_gate_ctrl)
                        frontend_ops->i2c_gate_ctrl(fe, 1);
 
-               err = tuner_ops->get_state(fe, DVBFE_TUNER_FREQUENCY, &state);
+               err = tuner_ops->get_frequency(fe, frequency);
                if (err < 0) {
-                       printk(KERN_ERR "%s: Invalid parameter\n", __func__);
+                       printk("%s: Invalid parameter\n", __func__);
                        return err;
                }
 
                if (frontend_ops->i2c_gate_ctrl)
                        frontend_ops->i2c_gate_ctrl(fe, 0);
-
-               *frequency = state.frequency;
        }
 
        return 0;
@@ -47,18 +47,21 @@ static int stb6100_set_freq(struct dvb_frontend *fe, u32 frequency)
 {
        struct dvb_frontend_ops *frontend_ops = &fe->ops;
        struct dvb_tuner_ops    *tuner_ops = &frontend_ops->tuner_ops;
-       struct tuner_state      state;
+       struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+       u32 bw = c->bandwidth_hz;
        int err = 0;
 
-       state.frequency = frequency;
+       c->frequency = frequency;
+       c->bandwidth_hz = 0;            /* Don't adjust the bandwidth */
 
-       if (tuner_ops->set_state) {
+       if (tuner_ops->set_params) {
                if (frontend_ops->i2c_gate_ctrl)
                        frontend_ops->i2c_gate_ctrl(fe, 1);
 
-               err = tuner_ops->set_state(fe, DVBFE_TUNER_FREQUENCY, &state);
+               err = tuner_ops->set_params(fe);
+               c->bandwidth_hz = bw;
                if (err < 0) {
-                       printk(KERN_ERR "%s: Invalid parameter\n", __func__);
+                       printk("%s: Invalid parameter\n", __func__);
                        return err;
                }
 
@@ -74,14 +77,13 @@ static int stb6100_get_bandw(struct dvb_frontend *fe, u32 *bandwidth)
 {
        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 (tuner_ops->get_state) {
+       if (tuner_ops->get_bandwidth) {
                if (frontend_ops->i2c_gate_ctrl)
                        frontend_ops->i2c_gate_ctrl(fe, 1);
 
-               err = tuner_ops->get_state(fe, DVBFE_TUNER_BANDWIDTH, &state);
+               err = tuner_ops->get_bandwidth(fe, bandwidth);
                if (err < 0) {
                        printk(KERN_ERR "%s: Invalid parameter\n", __func__);
                        return err;
@@ -89,8 +91,6 @@ static int stb6100_get_bandw(struct dvb_frontend *fe, u32 *bandwidth)
 
                if (frontend_ops->i2c_gate_ctrl)
                        frontend_ops->i2c_gate_ctrl(fe, 0);
-
-               *bandwidth = state.bandwidth;
        }
 
        return 0;
@@ -100,16 +100,19 @@ static int stb6100_set_bandw(struct dvb_frontend *fe, u32 bandwidth)
 {
        struct dvb_frontend_ops *frontend_ops = &fe->ops;
        struct dvb_tuner_ops    *tuner_ops = &frontend_ops->tuner_ops;
-       struct tuner_state      state;
+       struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+       u32 freq = c->frequency;
        int err = 0;
 
-       state.bandwidth = bandwidth;
+       c->bandwidth_hz = bandwidth;
+       c->frequency = 0;               /* Don't adjust the frequency */
 
-       if (tuner_ops->set_state) {
+       if (tuner_ops->set_params) {
                if (frontend_ops->i2c_gate_ctrl)
                        frontend_ops->i2c_gate_ctrl(fe, 1);
 
-               err = tuner_ops->set_state(fe, DVBFE_TUNER_BANDWIDTH, &state);
+               err = tuner_ops->set_params(fe);
+               c->frequency = freq;
                if (err < 0) {
                        printk(KERN_ERR "%s: Invalid parameter\n", __func__);
                        return err;