[media] partially reverts changeset fa5527c

This patch is applying some hunks that are already at changeset
c247d7b, causing a compilation breakage.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index d8dd971ad644c0abb791d5d51bed148f84ddfd5b..503a8d5b5382b018ab1e3329569a401325608a27 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -338,13 +338,6 @@ struct drxk_config pctv_520e_drxk = {
        .chunk_size = 58,
 };
 
-struct drxk_config pctv_520e_drxk = {
-       .adr = 0x29,
-       .single_master = 1,
-       .microcode_name = "dvb-demod-drxk-pctv.fw",
-       .chunk_size = 58,
-};
-
 static int drxk_gate_ctrl(struct dvb_frontend *fe, int enable)
 {
        struct em28xx_dvb *dvb = fe->sec_priv;
@@ -505,33 +498,6 @@ static void pctv_520e_init(struct em28xx *dev)
                i2c_master_send(&dev->i2c_client, regs[i].r, regs[i].len);
 };
 
-static void pctv_520e_init(struct em28xx *dev)
-{
-       /*
-        * Init TDA8295(?) analog demodulator. Looks like I2C traffic to
-        * digital demodulator and tuner are routed via TDA8295.
-        */
-       int i;
-       struct {
-               unsigned char r[4];
-               int len;
-       } regs[] = {
-               {{ 0x06, 0x02, 0x00, 0x31 }, 4},
-               {{ 0x01, 0x02 }, 2},
-               {{ 0x01, 0x02, 0x00, 0xc6 }, 4},
-               {{ 0x01, 0x00 }, 2},
-               {{ 0x01, 0x00, 0xff, 0xaf }, 4},
-               {{ 0x01, 0x00, 0x03, 0xa0 }, 4},
-               {{ 0x01, 0x00 }, 2},
-               {{ 0x01, 0x00, 0x73, 0xaf }, 4},
-       };
-
-       dev->i2c_client.addr = 0x82 >> 1; /* 0x41 */
-
-       for (i = 0; i < ARRAY_SIZE(regs); i++)
-               i2c_master_send(&dev->i2c_client, regs[i].r, regs[i].len);
-};
-
 static int em28xx_mt352_terratec_xs_init(struct dvb_frontend *fe)
 {
        /* Values extracted from a USB trace of the Terratec Windows driver */
@@ -1033,24 +999,6 @@ static int em28xx_dvb_init(struct em28xx *dev)
                                "driver version\n");
 
                break;
-       case EM2884_BOARD_PCTV_520E:
-               pctv_520e_init(dev);
-
-               /* attach demodulator */
-               dvb->fe[0] = dvb_attach(drxk_attach, &pctv_520e_drxk,
-                               &dev->i2c_adap);
-
-               if (dvb->fe[0]) {
-                       /* attach tuner */
-                       if (!dvb_attach(tda18271_attach, dvb->fe[0], 0x60,
-                                       &dev->i2c_adap,
-                                       &em28xx_cxd2820r_tda18271_config)) {
-                               dvb_frontend_detach(dvb->fe[0]);
-                               result = -EINVAL;
-                               goto out_free;
-                       }
-               }
-               break;
        case EM2884_BOARD_PCTV_510E:
        case EM2884_BOARD_PCTV_520E:
                pctv_520e_init(dev);