Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (5939): dvb-pll: make struct dvb_pll_fcv1236d static
  V4L/DVB (5933): Dvb-usb/af9005-fe.c: error check fixes
  V4L/DVB (5932): Af9005 fix tuner module unload
  V4L/DVB (5920): ivtv: fix incorrect fw size report.
  V4L/DVB (5918): ivtv: fix TV-out VBI handling, only reset on last close.
  V4L/DVB (5917): ivtv: improve mailbox responsiveness.
  V4L/DVB (5916): ivtv: fix pause/continue/play handling
  V4L/DVB (5900): usbvision: fix bugs [sg]_register functions
  V4L/DVB (5899): bttv: Fix Viewcast Osprey 440 support
  V4L/DVB (5893): DVB: fix includes of video.h when __KERNEL__ is undefined
  V4L/DVB (5891): zr36067: Turn off raw capture properly
  V4L/DVB (5890): zr36067: Add UYVY, RGB555X, RGB565X, and RGB32 formats
  V4L/DVB (5888): zr36067: Driver was not returning correct image size
  V4L/DVB (5887): zr36067: Fix poll() operation
  V4L/DVB (5886): zr36067: Fix problem setting norms

15 files changed, 343 insertions, 289 deletions

diff --git a/drivers/media/dvb/dvb-usb/af9005-fe.c b/drivers/media/dvb/dvb-usb/af9005-fe.c
index 7195c9461524..b1a9c4cdec93 100644
--- a/drivers/media/dvb/dvb-usb/af9005-fe.c
+++ b/drivers/media/dvb/dvb-usb/af9005-fe.c
@@ -29,8 +29,6 @@
 
 struct af9005_fe_state {
         struct dvb_usb_device *d;
-        struct dvb_frontend *tuner;
-
         fe_status_t stat;
 
         /* retraining parameters */
@@ -345,8 +343,8 @@ static int af9005_reset_pre_viterbi(struct dvb_frontend *fe)
                                        1 & 0xff);
         if (ret)
                 return ret;
-        af9005_write_ofdm_register(state->d, xd_p_fec_super_frm_unit_15_8,
-                                   1 >> 8);
+        ret = af9005_write_ofdm_register(state->d, xd_p_fec_super_frm_unit_15_8,
+                                         1 >> 8);
         if (ret)
                 return ret;
         /* reset pre viterbi error count */
@@ -447,7 +445,7 @@ static int af9005_fe_read_status(struct dvb_frontend *fe, fe_status_t * stat)
         u8 temp;
         int ret;
 
-        if (state->tuner == NULL)
+        if (fe->ops.tuner_ops.release == NULL)
                 return -ENODEV;
 
         *stat = 0;
@@ -493,7 +491,7 @@ static int af9005_fe_read_status(struct dvb_frontend *fe, fe_status_t * stat)
 static int af9005_fe_read_ber(struct dvb_frontend *fe, u32 * ber)
 {
         struct af9005_fe_state *state = fe->demodulator_priv;
-        if (state->tuner == NULL)
+        if (fe->ops.tuner_ops.release  == NULL)
                 return -ENODEV;
         af9005_fe_refresh_state(fe);
         *ber = state->ber;
@@ -503,7 +501,7 @@ static int af9005_fe_read_ber(struct dvb_frontend *fe, u32 * ber)
 static int af9005_fe_read_unc_blocks(struct dvb_frontend *fe, u32 * unc)
 {
         struct af9005_fe_state *state = fe->demodulator_priv;
-        if (state->tuner == NULL)
+        if (fe->ops.tuner_ops.release == NULL)
                 return -ENODEV;
         af9005_fe_refresh_state(fe);
         *unc = state->unc;
@@ -517,7 +515,7 @@ static int af9005_fe_read_signal_strength(struct dvb_frontend *fe,
         int ret;
         u8 if_gain, rf_gain;
 
-        if (state->tuner == NULL)
+        if (fe->ops.tuner_ops.release == NULL)
                 return -ENODEV;
         ret =
             af9005_read_ofdm_register(state->d, xd_r_reg_aagc_rf_gain,
@@ -881,10 +879,8 @@ static int af9005_fe_init(struct dvb_frontend *fe)
              af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst,
                                         reg_ofdm_rst_pos, reg_ofdm_rst_len, 1)))
                 return ret;
-        if ((ret =
-             af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst,
-                                        reg_ofdm_rst_pos, reg_ofdm_rst_len, 0)))
-                return ret;
+        ret = af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst,
+                                         reg_ofdm_rst_pos, reg_ofdm_rst_len, 0);
 
         if (ret)
                 return ret;
@@ -1041,7 +1037,7 @@ static int af9005_fe_init(struct dvb_frontend *fe)
                 return ret;
 
         /* attach tuner and init */
-        if (state->tuner == NULL) {
+        if (fe->ops.tuner_ops.release == NULL) {
                 /* read tuner and board id from eeprom */
                 ret = af9005_read_eeprom(adap->dev, 0xc6, buf, 2);
                 if (ret) {
@@ -1058,20 +1054,16 @@ static int af9005_fe_init(struct dvb_frontend *fe)
                                 return ret;
                         }
                         if1 = (u16) (buf[0] << 8) + buf[1];
-                        state->tuner =
-                            dvb_attach(mt2060_attach, fe, &adap->dev->i2c_adap,
-                                       &af9005_mt2060_config, if1);
-                        if (state->tuner == NULL) {
+                        if (dvb_attach(mt2060_attach, fe, &adap->dev->i2c_adap,
+                                         &af9005_mt2060_config, if1) == NULL) {
                                 deb_info("MT2060 attach failed\n");
                                 return -ENODEV;
                         }
                         break;
                 case 3: /* QT1010 */
                 case 9: /* QT1010B */
-                        state->tuner =
-                            dvb_attach(qt1010_attach, fe, &adap->dev->i2c_adap,
-                                       &af9005_qt1010_config);
-                        if (state->tuner == NULL) {
+                        if (dvb_attach(qt1010_attach, fe, &adap->dev->i2c_adap,
+                                        &af9005_qt1010_config) ==NULL) {
                                 deb_info("QT1010 attach failed\n");
                                 return -ENODEV;
                         }
@@ -1080,7 +1072,7 @@ static int af9005_fe_init(struct dvb_frontend *fe)
                         err("Unsupported tuner type %d", buf[0]);
                         return -ENODEV;
                 }
-                ret = state->tuner->ops.tuner_ops.init(state->tuner);
+                ret = fe->ops.tuner_ops.init(fe);
                 if (ret)
                         return ret;
         }
@@ -1118,7 +1110,7 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe,
 
         deb_info("af9005_fe_set_frontend freq %d bw %d\n", fep->frequency,
                  fep->u.ofdm.bandwidth);
-        if (state->tuner == NULL) {
+        if (fe->ops.tuner_ops.release == NULL) {
                 err("Tuner not attached");
                 return -ENODEV;
         }
@@ -1199,7 +1191,7 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe,
                 return ret;
         /* set tuner */