V4L/DVB (3199): Removed some unneeded #ifdef's

[firefly-linux-kernel-4.4.55.git] / drivers / media / dvb / bt8xx / dvb-bt8xx.c

diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 2e398090cf63e1e70d3af43aee7b9079862aa760..9cac4e7959508fe346a30872ca07a9b83e6c29a2 100644 (file)
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -556,9 +556,9 @@ static int tdvs_tua6034_pll_set(struct dvb_frontend* fe, struct dvb_frontend_par
        dprintk("%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",
                __FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);
        if ((err = i2c_transfer(card->i2c_adapter, &msg, 1)) != 1) {
-               printk(KERN_WARNING "dvb-bt8xx: %s error "
-                       "(addr %02x <- %02x, err = %i)\n",
-                       __FUNCTION__, buf[0], buf[1], err);
+               printk(KERN_WARNING "dvb-bt8xx: %s error "
+                       "(addr %02x <- %02x, err = %i)\n",
+                       __FUNCTION__, buf[0], buf[1], err);
                if (err < 0)
                        return err;
                else
@@ -600,7 +600,6 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
        struct dst_state* state = NULL;
 
        switch(type) {
-#ifdef BTTV_BOARD_DVICO_DVBT_LITE
        case BTTV_BOARD_DVICO_DVBT_LITE:
                card->fe = mt352_attach(&thomson_dtt7579_config, card->i2c_adapter);
                if (card->fe != NULL) {
@@ -608,16 +607,13 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                        card->fe->ops->info.frequency_max = 862000000;
                }
                break;
-#endif
 
-#ifdef BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE
        case BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE:
                lgdt330x_reset(card);
                card->fe = lgdt330x_attach(&tdvs_tua6034_config, card->i2c_adapter);
                if (card->fe != NULL)
                        dprintk ("dvb_bt8xx: lgdt330x detected\n");
                break;
-#endif
 
 #ifdef BTTV_BOARD_TWINHAN_VP3021
        case BTTV_BOARD_TWINHAN_VP3021:
@@ -812,9 +808,7 @@ static int dvb_bt8xx_probe(struct device *dev)
                card->irq_err_ignore = 0;
                break;
 
-#ifdef BTTV_BOARD_DVICO_DVBT_LITE
        case BTTV_BOARD_DVICO_DVBT_LITE:
-#endif
                card->gpio_mode = 0x0400C060;
                card->op_sync_orin = 0;
                card->irq_err_ignore = 0;
@@ -823,9 +817,7 @@ static int dvb_bt8xx_probe(struct device *dev)
                 * DA_APP(parallel) */
                break;
 
-#ifdef BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE
        case BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE:
-#endif
                card->gpio_mode = 0x0400c060;
                card->op_sync_orin = BT878_RISC_SYNC_MASK;
                card->irq_err_ignore = BT878_AFBUS | BT878_AFDSR;