Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (655 commits)
  [media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver
  mb86a20s: Add a few more register settings at the init seq
  mb86a20s: Group registers into the same line
  [media] [PATCH] don't reset the delivery system on DTV_CLEAR
  [media] [BUG] it913x-fe fix typo error making SNR levels unstable
  [media] cx23885: Query the CX25840 during enum_input for status
  [media] cx25840: Add support for g_input_status
  [media] rc-videomate-m1f.c Rename to match remote controler name
  [media] drivers: media: au0828: Fix dependency for VIDEO_AU0828
  [media] convert drivers/media/* to use module_platform_driver()
  [media] drivers: video: cx231xx: Fix dependency for VIDEO_CX231XX_DVB
  [media] Exynos4 JPEG codec v4l2 driver
  [media] doc: v4l: selection: choose pixels as units for selection rectangles
  [media] v4l: s5p-tv: mixer: fix setup of VP scaling
  [media] v4l: s5p-tv: mixer: add support for selection API
  [media] v4l: emulate old crop API using extended crop/compose API
  [media] doc: v4l: add documentation for selection API
  [media] doc: v4l: add binary images for selection API
  [media] v4l: add support for selection api
  [media] hd29l2: fix review findings
  ...

1 files changed, 15 insertions, 17 deletions

diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/dvb/dvb-usb/vp7045-fe.c
index 8452eef9032..b8825b18c00 100644
--- a/drivers/media/dvb/dvb-usb/vp7045-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp7045-fe.c
@@ -103,9 +103,9 @@ static int vp7045_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_front
         return 0;
 }
 
-static int vp7045_fe_set_frontend(struct dvb_frontend* fe,
-                                  struct dvb_frontend_parameters *fep)
+static int vp7045_fe_set_frontend(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
         struct vp7045_fe_state *state = fe->demodulator_priv;
         u8 buf[5];
         u32 freq = fep->frequency / 1000;
@@ -115,25 +115,24 @@ static int vp7045_fe_set_frontend(struct dvb_frontend* fe,
         buf[2] =  freq        & 0xff;
         buf[3] = 0;
 
-        switch (fep->u.ofdm.bandwidth) {
-                case BANDWIDTH_8_MHZ: buf[4] = 8; break;
-                case BANDWIDTH_7_MHZ: buf[4] = 7; break;
-                case BANDWIDTH_6_MHZ: buf[4] = 6; break;
-                case BANDWIDTH_AUTO: return -EOPNOTSUPP;
-                default:
-                        return -EINVAL;
+        switch (fep->bandwidth_hz) {
+        case 8000000:
+                buf[4] = 8;
+                break;
+        case 7000000:
+                buf[4] = 7;
+                break;
+        case 6000000:
+                buf[4] = 6;
+                break;
+        default:
+                return -EINVAL;
         }
 
         vp7045_usb_op(state->d,LOCK_TUNER_COMMAND,buf,5,NULL,0,200);
         return 0;
 }
 
-static int vp7045_fe_get_frontend(struct dvb_frontend* fe,
-                                  struct dvb_frontend_parameters *fep)
-{
-        return 0;
-}
-
 static void vp7045_fe_release(struct dvb_frontend* fe)
 {
         struct vp7045_fe_state *state = fe->demodulator_priv;
@@ -159,9 +158,9 @@ error:
 
 
 static struct dvb_frontend_ops vp7045_fe_ops = {
+        .delsys = { SYS_DVBT },
         .info = {
                 .name                   = "Twinhan VP7045/46 USB DVB-T",
-                .type                   = FE_OFDM,
                 .frequency_min          = 44250000,
                 .frequency_max          = 867250000,
                 .frequency_stepsize     = 1000,
@@ -181,7 +180,6 @@ static struct dvb_frontend_ops vp7045_fe_ops = {
         .sleep = vp7045_fe_sleep,
 
         .set_frontend = vp7045_fe_set_frontend,
-        .get_frontend = vp7045_fe_get_frontend,
         .get_tune_settings = vp7045_fe_get_tune_settings,
 
         .read_status = vp7045_fe_read_status,