evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] xc5000: Don't wrap msleep()

Browse source 
There's absolutely no reason to wrap msleep() call here.
Just rename all occurences of xc_wait() with msleep() and
remove the wrapper function.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2014-05-21 13:15:17 -03:00
parent 859ae7f012
commit e5bf4a1107
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/media/tuners/xc5000.c
View file

@ -293,11 +293,6 @@ static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val)
return 0; return 0;
} }
static void xc_wait(int wait_ms)
{
msleep(wait_ms);
}
static int xc5000_TunerReset(struct dvb_frontend *fe) static int xc5000_TunerReset(struct dvb_frontend *fe)
{ {
struct xc5000_priv *priv = fe->tuner_priv; struct xc5000_priv *priv = fe->tuner_priv;
@ -342,7 +337,7 @@ static int xc_write_reg(struct xc5000_priv *priv, u16 regAddr, u16 i2cData)
/* busy flag cleared */ /* busy flag cleared */
break; break;
} else { } else {
xc_wait(5); /* wait 5 ms */ msleep(5); /* wait 5 ms */
WatchDogTimer--; WatchDogTimer--;
} }
} }
@ -374,7 +369,7 @@ static int xc_load_i2c_sequence(struct dvb_frontend *fe, const u8 *i2c_sequence)
return result; return result;
} else if (len & 0x8000) { } else if (len & 0x8000) {
/* WAIT command */ /* WAIT command */
xc_wait(len & 0x7FFF); msleep(len & 0x7FFF);
index += 2; index += 2;
} else { } else {
/* Send i2c data whilst ensuring individual transactions /* Send i2c data whilst ensuring individual transactions
@ -571,7 +566,7 @@ static u16 WaitForLock(struct xc5000_priv *priv)
while ((lockState == 0) && (watchDogCount > 0)) { while ((lockState == 0) && (watchDogCount > 0)) {
xc_get_lock_status(priv, &lockState); xc_get_lock_status(priv, &lockState);
if (lockState != 1) { if (lockState != 1) {
xc_wait(5); msleep(5);
watchDogCount--; watchDogCount--;
} }
} }
@ -687,7 +682,7 @@ static void xc_debug_dump(struct xc5000_priv *priv)
* Frame Lines needs two frame times after initial lock * Frame Lines needs two frame times after initial lock
* before it is valid. * before it is valid.
*/ */
xc_wait(100); msleep(100);
xc_get_ADC_Envelope(priv, &adc_envelope); xc_get_ADC_Envelope(priv, &adc_envelope);
dprintk(1, "*** ADC envelope (0-1023) = %d\n", adc_envelope); dprintk(1, "*** ADC envelope (0-1023) = %d\n", adc_envelope);
@ -1137,7 +1132,7 @@ fw_retry:
* I2C transactions until calibration is complete. This way we * I2C transactions until calibration is complete. This way we
* don't have to rely on clock stretching working. * don't have to rely on clock stretching working.
*/ */
xc_wait(100); msleep(100);
if (priv->init_status_supported) { if (priv->init_status_supported) {
if (xc5000_readreg(priv, XREG_INIT_STATUS, &fw_ck) != 0) { if (xc5000_readreg(priv, XREG_INIT_STATUS, &fw_ck) != 0) {