diff options
Diffstat (limited to 'linux/drivers/media/dvb/frontends/tda1004x.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/tda1004x.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/linux/drivers/media/dvb/frontends/tda1004x.c b/linux/drivers/media/dvb/frontends/tda1004x.c index 7ea4dff61..888d83f4d 100644 --- a/linux/drivers/media/dvb/frontends/tda1004x.c +++ b/linux/drivers/media/dvb/frontends/tda1004x.c @@ -294,7 +294,7 @@ static int tda1004x_enable_tuner_i2c(struct i2c_adapter *i2c, struct tda1004x_st dprintk("%s\n", __FUNCTION__); result = tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC4, 2, 2); - dvb_delay(1); + msleep(1); return result; } @@ -453,7 +453,7 @@ static int tda10045_fwupload(struct i2c_adapter *i2c, struct tda1004x_state *sta tda1004x_write_mask(i2c, state, TDA1004X_CONFC4, 0x10, 0); tda1004x_write_mask(i2c, state, TDA1004X_CONFC4, 8, 8); tda1004x_write_mask(i2c, state, TDA1004X_CONFC4, 8, 0); - dvb_delay(10); + msleep(10); /* set parameters */ tda10045h_set_bandwidth(i2c, state, BANDWIDTH_8_MHZ); @@ -464,7 +464,7 @@ static int tda10045_fwupload(struct i2c_adapter *i2c, struct tda1004x_state *sta /* wait for DSP to initialise */ /* DSPREADY doesn't seem to work on the TDA10045H */ - dvb_delay(100); + msleep(100); ret = tda1004x_check_upload_ok(i2c, state); if (ret) @@ -488,7 +488,7 @@ static int tda10046_fwupload(struct i2c_adapter *i2c, struct tda1004x_state *sta /* reset chip */ tda1004x_write_mask(i2c, state, TDA1004X_CONFC4, 1, 0); tda1004x_write_mask(i2c, state, TDA10046H_CONF_TRISTATE1, 1, 0); - dvb_delay(10); + msleep(10); /* set parameters */ tda1004x_write_byte(i2c, state, TDA10046H_CONFPLL2, 10); @@ -509,7 +509,7 @@ static int tda10046_fwupload(struct i2c_adapter *i2c, struct tda1004x_state *sta printk("tda1004x: DSP failed to initialised.\n"); return -EIO; } - dvb_delay(1); + msleep(1); } ret = tda1004x_check_upload_ok(i2c, state); @@ -784,7 +784,7 @@ static int tda1004x_set_frequency(struct i2c_adapter *i2c, if (i2c_transfer(i2c, &tuner_msg, 1) != 1) { return -EIO; } - dvb_delay(1); + msleep(1); tda1004x_disable_tuner_i2c(i2c, tda_state); if (tda_state->fe_type == FE_TYPE_TDA10046H) tda1004x_write_mask(i2c, tda_state, TDA10046H_AGC_CONF, 4, 4); @@ -968,12 +968,12 @@ static int tda1004x_set_fe(struct i2c_adapter *i2c, case FE_TYPE_TDA10045H: tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC4, 8, 8); tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC4, 8, 0); - dvb_delay(10); + msleep(10); break; case FE_TYPE_TDA10046H: tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 0x40, 0x40); - dvb_delay(10); + msleep(10); break; } @@ -1394,7 +1394,7 @@ static int tda1004x_attach(struct i2c_adapter *i2c, struct tda1004x_state* state tuner_msg.buf = td1344_init; tuner_msg.len = sizeof(td1344_init); if (i2c_transfer(i2c, &tuner_msg, 1) == 1) { - dvb_delay(1); + msleep(1); tuner_address = 0x61; tuner_type = TUNER_TYPE_TD1344; printk("tda1004x: Detected Philips TD1344 tuner.\n"); @@ -1407,7 +1407,7 @@ static int tda1004x_attach(struct i2c_adapter *i2c, struct tda1004x_state* state tuner_msg.buf = td1316_init; tuner_msg.len = sizeof(td1316_init); if (i2c_transfer(i2c, &tuner_msg, 1) == 1) { - dvb_delay(1); + msleep(1); tuner_address = 0x63; tuner_type = TUNER_TYPE_TD1316; printk("tda1004x: Detected Philips TD1316 tuner.\n"); @@ -1420,7 +1420,7 @@ static int tda1004x_attach(struct i2c_adapter *i2c, struct tda1004x_state* state tuner_msg.buf = td1316_init_tda10046h; tuner_msg.len = sizeof(td1316_init_tda10046h); if (i2c_transfer(i2c, &tuner_msg, 1) == 1) { - dvb_delay(1); + msleep(1); tuner_address = 0x60; tuner_type = TUNER_TYPE_TD1316; printk("tda1004x: Detected Philips TD1316 tuner.\n"); |