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 ...
author: Linus Torvalds <torvalds@linux-foundation.org> 2012-01-15 15:49:56 -0500
committer: Linus Torvalds <torvalds@linux-foundation.org> 2012-01-15 15:49:56 -0500
commit: 122804ecb59493fbb4d31b3ba9ac59faaf45276f (patch)
tree: cff4d8a158c412e4a8d3abc8d91bb0eb52b01c9a /drivers/media/dvb/ttusb-budget
parent: 16008d641670571ff4cd750b416c7caf2d89f467 (diff)
parent: 126400033940afb658123517a2e80eb68259fbd7 (diff)
1 files changed, 58 insertions, 44 deletions
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index e90192fdde11..5b682cc4c814 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1017,19 +1017,20 @@ static u32 functionality(struct i2c_adapter *adapter)
-static int alps_tdmb7_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+static int alps_tdmb7_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
        struct ttusb* ttusb = (struct ttusb*) fe->dvb->priv;
        u8 data[4];
        struct i2c_msg msg = {.addr=0x61, .flags=0, .buf=data, .len=sizeof(data) };
        u32 div;
-        div = (params->frequency + 36166667) / 166667;
+        div = (p->frequency + 36166667) / 166667;
        data[0] = (div >> 8) & 0x7f;
        data[1] = div & 0xff;
        data[2] = ((div >> 10) & 0x60) | 0x85;
-        data[3] = params->frequency < 592000000 ? 0x40 : 0x80;
+        data[3] = p->frequency < 592000000 ? 0x40 : 0x80;
        if (fe->ops.i2c_gate_ctrl)
                fe->ops.i2c_gate_ctrl(fe, 1);
@@ -1071,8 +1072,9 @@ static int philips_tdm1316l_tuner_init(struct dvb_frontend* fe)
        return 0;
 }
-static int philips_tdm1316l_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
        struct ttusb* ttusb = (struct ttusb*) fe->dvb->priv;
        u8 tuner_buf[4];
        struct i2c_msg tuner_msg = {.addr=0x60, .flags=0, .buf=tuner_buf, .len=sizeof(tuner_buf) };
@@ -1080,7 +1082,7 @@ static int philips_tdm1316l_tuner_set_params(struct dvb_frontend* fe, struct dvb
        u8 band, cp, filter;
        // determine charge pump
-        tuner_frequency = params->frequency + 36130000;
+        tuner_frequency = p->frequency + 36130000;
        if (tuner_frequency < 87000000) return -EINVAL;
        else if (tuner_frequency < 130000000) cp = 3;
        else if (tuner_frequency < 160000000) cp = 5;
@@ -1094,25 +1096,29 @@ static int philips_tdm1316l_tuner_set_params(struct dvb_frontend* fe, struct dvb
        else return -EINVAL;
        // determine band
-        if (params->frequency < 49000000) return -EINVAL;
+        if (p->frequency < 49000000)
-        else if (params->frequency < 159000000) band = 1;
+                return -EINVAL;
-        else if (params->frequency < 444000000) band = 2;
+        else if (p->frequency < 159000000)
-        else if (params->frequency < 861000000) band = 4;
+                band = 1;
+        else if (p->frequency < 444000000)
+                band = 2;
+        else if (p->frequency < 861000000)
+                band = 4;
        else return -EINVAL;
        // setup PLL filter
-        switch (params->u.ofdm.bandwidth) {
+        switch (p->bandwidth_hz) {
-        case BANDWIDTH_6_MHZ:
+        case 6000000:
                tda1004x_writereg(fe, 0x0C, 0);
                filter = 0;
                break;
-        case BANDWIDTH_7_MHZ:
+        case 7000000:
                tda1004x_writereg(fe, 0x0C, 0);
                filter = 0;
                break;
-        case BANDWIDTH_8_MHZ:
+        case 8000000:
                tda1004x_writereg(fe, 0x0C, 0xFF);
                filter = 1;
                break;
@@ -1123,7 +1129,7 @@ static int philips_tdm1316l_tuner_set_params(struct dvb_frontend* fe, struct dvb
        // calculate divisor
        // ((36130000+((1000000/6)/2)) + Finput)/(1000000/6)
-        tuner_frequency = (((params->frequency / 1000) * 6) + 217280) / 1000;
+        tuner_frequency = (((p->frequency / 1000) * 6) + 217280) / 1000;
        // setup tuner buffer
        tuner_buf[0] = tuner_frequency >> 8;
@@ -1273,23 +1279,24 @@ static int alps_stv0299_set_symbol_rate(struct dvb_frontend *fe, u32 srate, u32
        return 0;
 }
-static int philips_tsa5059_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+static int philips_tsa5059_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
        struct ttusb* ttusb = (struct ttusb*) fe->dvb->priv;
        u8 buf[4];
        u32 div;
        struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) };
-        if ((params->frequency < 950000) || (params->frequency > 2150000))
+        if ((p->frequency < 950000) || (p->frequency > 2150000))
                return -EINVAL;
-        div = (params->frequency + (125 - 1)) / 125;    // round correctly
+        div = (p->frequency + (125 - 1)) / 125; /* round correctly */
        buf[0] = (div >> 8) & 0x7f;
        buf[1] = div & 0xff;
        buf[2] = 0x80 | ((div & 0x18000) >> 10) | 4;
        buf[3] = 0xC4;
-        if (params->frequency > 1530000)
+        if (p->frequency > 1530000)
                buf[3] = 0xC0;
        /* BSBE1 wants XCE bit set */
@@ -1316,14 +1323,15 @@ static struct stv0299_config alps_stv0299_config = {
        .set_symbol_rate = alps_stv0299_set_symbol_rate,
 };
-static int ttusb_novas_grundig_29504_491_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+static int ttusb_novas_grundig_29504_491_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
        struct ttusb* ttusb = (struct ttusb*) fe->dvb->priv;
        u8 buf[4];
        u32 div;
        struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) };
-        div = params->frequency / 125;
+        div = p->frequency / 125;
        buf[0] = (div >> 8) & 0x7f;
        buf[1] = div & 0xff;
@@ -1343,19 +1351,20 @@ static struct tda8083_config ttusb_novas_grundig_29504_491_config = {
        .demod_address = 0x68,
 };
-static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+static int alps_tdbe2_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
        struct ttusb* ttusb = fe->dvb->priv;
        u32 div;
        u8 data[4];
        struct i2c_msg msg = { .addr = 0x62, .flags = 0, .buf = data, .len = sizeof(data) };
-        div = (params->frequency + 35937500 + 31250) / 62500;
+        div = (p->frequency + 35937500 + 31250) / 62500;
        data[0] = (div >> 8) & 0x7f;
        data[1] = div & 0xff;
        data[2] = 0x85 | ((div >> 10) & 0x60);
-        data[3] = (params->frequency < 174000000 ? 0x88 : params->frequency < 470000000 ? 0x84 : 0x81);
+        data[3] = (p->frequency < 174000000 ? 0x88 : p->frequency < 470000000 ? 0x84 : 0x81);
        if (fe->ops.i2c_gate_ctrl)
                fe->ops.i2c_gate_ctrl(fe, 1);
@@ -1387,8 +1396,9 @@ static u8 read_pwm(struct ttusb* ttusb)
 }
-static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
        struct ttusb *ttusb = (struct ttusb *) fe->dvb->priv;
        u8 tuner_buf[5];
        struct i2c_msg tuner_msg = {.addr = 0x60,
@@ -1399,7 +1409,7 @@ static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struc
        u8 band, cp, filter;
        // determine charge pump
-        tuner_frequency = params->frequency;
+        tuner_frequency = p->frequency;
        if      (tuner_frequency <  87000000) {return -EINVAL;}
        else if (tuner_frequency < 130000000) {cp = 3; band = 1;}
        else if (tuner_frequency < 160000000) {cp = 5; band = 1;}
@@ -1417,7 +1427,7 @@ static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struc
        // calculate divisor
        // (Finput + Fif)/Fref; Fif = 36125000 Hz, Fref = 62500 Hz
-        tuner_frequency = ((params->frequency + 36125000) / 62500);
+        tuner_frequency = ((p->frequency + 36125000) / 62500);
        // setup tuner buffer
        tuner_buf[0] = tuner_frequency >> 8;
@@ -1694,10 +1704,8 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
        ttusb->i2c_adap.dev.parent        = &udev->dev;
        result = i2c_add_adapter(&ttusb->i2c_adap);
-        if (result) {
+        if (result)
-                dvb_unregister_adapter (&ttusb->adapter);
+                goto err_unregister_adapter;
-                return result;
-        }
        memset(&ttusb->dvb_demux, 0, sizeof(ttusb->dvb_demux));
@@ -1714,33 +1722,29 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
        ttusb->dvb_demux.stop_feed = ttusb_stop_feed;
        ttusb->dvb_demux.write_to_decoder = NULL;
-        if ((result = dvb_dmx_init(&ttusb->dvb_demux)) < 0) {
+        result = dvb_dmx_init(&ttusb->dvb_demux);
+        if (result < 0) {
                printk("ttusb_dvb: dvb_dmx_init failed (errno = %d)\n", result);
-                i2c_del_adapter(&ttusb->i2c_adap);
+                result = -ENODEV;
-                dvb_unregister_adapter (&ttusb->adapter);
+                goto err_i2c_del_adapter;
-                return -ENODEV;
        }
 //FIXME dmxdev (nur WAS?)
        ttusb->dmxdev.filternum = ttusb->dvb_demux.filternum;
        ttusb->dmxdev.demux = &ttusb->dvb_demux.dmx;
        ttusb->dmxdev.capabilities = 0;
-        if ((result = dvb_dmxdev_init(&ttusb->dmxdev, &ttusb->adapter)) < 0) {
+        result = dvb_dmxdev_init(&ttusb->dmxdev, &ttusb->adapter);
+        if (result < 0) {
                printk("ttusb_dvb: dvb_dmxdev_init failed (errno = %d)\n",
                       result);
-                dvb_dmx_release(&ttusb->dvb_demux);
+                result = -ENODEV;
-                i2c_del_adapter(&ttusb->i2c_adap);
+                goto err_release_dmx;
-                dvb_unregister_adapter (&ttusb->adapter);
-                return -ENODEV;
        }
        if (dvb_net_init(&ttusb->adapter, &ttusb->dvbnet, &ttusb->dvb_demux.dmx)) {
                printk("ttusb_dvb: dvb_net_init failed!\n");
-                dvb_dmxdev_release(&ttusb->dmxdev);
+                result = -ENODEV;
-                dvb_dmx_release(&ttusb->dvb_demux);
+                goto err_release_dmxdev;
-                i2c_del_adapter(&ttusb->i2c_adap);
-                dvb_unregister_adapter (&ttusb->adapter);
-                return -ENODEV;
        }
        usb_set_intfdata(intf, (void *) ttusb);
@@ -1748,6 +1752,16 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
        frontend_init(ttusb);
        return 0;
+err_release_dmxdev:
+        dvb_dmxdev_release(&ttusb->dmxdev);
+err_release_dmx:
+        dvb_dmx_release(&ttusb->dvb_demux);
+err_i2c_del_adapter:
+        i2c_del_adapter(&ttusb->i2c_adap);
+err_unregister_adapter:
+        dvb_unregister_adapter (&ttusb->adapter);
+        return result;
 }
 static void ttusb_disconnect(struct usb_interface *intf)
author	Linus Torvalds <torvalds@linux-foundation.org>	2012-01-15 15:49:56 -0500
committer	Linus Torvalds <torvalds@linux-foundation.org>	2012-01-15 15:49:56 -0500
commit	122804ecb59493fbb4d31b3ba9ac59faaf45276f (patch)
tree	cff4d8a158c412e4a8d3abc8d91bb0eb52b01c9a /drivers/media/dvb/ttusb-budget
parent	16008d641670571ff4cd750b416c7caf2d89f467 (diff)
parent	126400033940afb658123517a2e80eb68259fbd7 (diff)