media: ngene: cleanup superfluous I2C adapter evaluation

[sfrench/cifs-2.6.git] / drivers / media / pci / ngene / ngene-cards.c

diff --git a/drivers/media/pci/ngene/ngene-cards.c b/drivers/media/pci/ngene/ngene-cards.c
index 594990c0d2b8d29afc6c5eaacf6c89781f664650..7738565193d600a585a3c05aba5e14cd36e4436d 100644 (file)
--- a/drivers/media/pci/ngene/ngene-cards.c
+++ b/drivers/media/pci/ngene/ngene-cards.c
@@ -137,11 +137,6 @@ static int tuner_attach_stv6110(struct ngene_channel *chan)
                chan->dev->card_info->tuner_config[chan->number];
        const struct stv6110x_devctl *ctl;
 
-       if (chan->number < 2)
-               i2c = &chan->dev->channel[0].i2c_adapter;
-       else
-               i2c = &chan->dev->channel[1].i2c_adapter;
-
        ctl = dvb_attach(stv6110x_attach, chan->fe, tunerconf, i2c);
        if (ctl == NULL) {
                dev_err(pdev, "No STV6110X found!\n");
@@ -304,14 +299,6 @@ static int demod_attach_stv0900(struct ngene_channel *chan)
        struct stv090x_config *feconf = (struct stv090x_config *)
                chan->dev->card_info->fe_config[chan->number];
 
-       /* tuner 1+2: i2c adapter #0, tuner 3+4: i2c adapter #1 */
-       /* Note: Both adapters share the same i2c bus, but the demod     */
-       /*       driver requires that each demod has its own i2c adapter */
-       if (chan->number < 2)
-               i2c = &chan->dev->channel[0].i2c_adapter;
-       else
-               i2c = &chan->dev->channel[1].i2c_adapter;
-
        chan->fe = dvb_attach(stv090x_attach, feconf, i2c,
                        (chan->number & 1) == 0 ? STV090x_DEMODULATOR_0
                                                : STV090x_DEMODULATOR_1);