diff options
| author | Devin Heitmueller <dheitmueller@kernellabs.com> | 2009-07-22 21:52:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 17:52:29 -0300 |
| commit | 02dec509825dd5cb9f4bfa0526c75c0a7c20348a (patch) | |
| tree | d103fd69cceee0facf982a9a590f3ed536ab1300 /drivers/media/common/tuners | |
| parent | 6bf60d56b36d7d4d0bdfb2996d56b064923ea541 (diff) | |
[media] xc4000: remove XREG_BUSY code only supported in xc5000
The xc4000 driver is based on the original xc5000 driver, and while the
xc5000 supports the XREG_BUSY register, the xc4000 does not. So remove the
code in question.
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common/tuners')
| -rw-r--r-- | drivers/media/common/tuners/xc4000.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/drivers/media/common/tuners/xc4000.c b/drivers/media/common/tuners/xc4000.c index a7f8b29e38f..fd9119eb331 100644 --- a/drivers/media/common/tuners/xc4000.c +++ b/drivers/media/common/tuners/xc4000.c @@ -130,7 +130,6 @@ struct xc4000_priv { #define XREG_SNR 0x06 #define XREG_VERSION 0x07 #define XREG_PRODUCT_ID 0x08 -//#define XREG_BUSY 0x09 //#define XREG_BUILD 0x0D /* @@ -310,7 +309,6 @@ static int xc4000_TunerReset(struct dvb_frontend *fe) static int xc_write_reg(struct xc4000_priv *priv, u16 regAddr, u16 i2cData) { u8 buf[4]; -// int WatchDogTimer = 100; int result; buf[0] = (regAddr >> 8) & 0xFF; @@ -318,30 +316,6 @@ static int xc_write_reg(struct xc4000_priv *priv, u16 regAddr, u16 i2cData) buf[2] = (i2cData >> 8) & 0xFF; buf[3] = i2cData & 0xFF; result = xc_send_i2c_data(priv, buf, 4); -//WAS THERE -// if (result == XC_RESULT_SUCCESS) { -// /* wait for busy flag to clear */ -// while ((WatchDogTimer > 0) && (result == XC_RESULT_SUCCESS)) { -// buf[0] = 0; -// buf[1] = XREG_BUSY; -// -// result = xc_send_i2c_data(priv, buf, 2); -// if (result == XC_RESULT_SUCCESS) { -// result = xc_read_i2c_data(priv, buf, 2); -// if (result == XC_RESULT_SUCCESS) { -// if ((buf[0] == 0) && (buf[1] == 0)) { -// /* busy flag cleared */ -// break; -// } else { -// xc_wait(5); /* wait 5 ms */ -// WatchDogTimer--; -// } -// } -// } -// } -// } -// if (WatchDogTimer < 0) -// result = XC_RESULT_I2C_WRITE_FAILURE; return result; } |