diff options
author | Devin Heitmueller <dheitmueller@kernellabs.com> | 2009-07-22 20:52:11 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:52:29 -0400 |
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 a7f8b29e38fd..fd9119eb3316 100644 --- a/drivers/media/common/tuners/xc4000.c +++ b/drivers/media/common/tuners/xc4000.c | |||
@@ -130,7 +130,6 @@ struct xc4000_priv { | |||
130 | #define XREG_SNR 0x06 | 130 | #define XREG_SNR 0x06 |
131 | #define XREG_VERSION 0x07 | 131 | #define XREG_VERSION 0x07 |
132 | #define XREG_PRODUCT_ID 0x08 | 132 | #define XREG_PRODUCT_ID 0x08 |
133 | //#define XREG_BUSY 0x09 | ||
134 | //#define XREG_BUILD 0x0D | 133 | //#define XREG_BUILD 0x0D |
135 | 134 | ||
136 | /* | 135 | /* |
@@ -310,7 +309,6 @@ static int xc4000_TunerReset(struct dvb_frontend *fe) | |||
310 | static int xc_write_reg(struct xc4000_priv *priv, u16 regAddr, u16 i2cData) | 309 | static int xc_write_reg(struct xc4000_priv *priv, u16 regAddr, u16 i2cData) |
311 | { | 310 | { |
312 | u8 buf[4]; | 311 | u8 buf[4]; |
313 | // int WatchDogTimer = 100; | ||
314 | int result; | 312 | int result; |
315 | 313 | ||
316 | buf[0] = (regAddr >> 8) & 0xFF; | 314 | buf[0] = (regAddr >> 8) & 0xFF; |
@@ -318,30 +316,6 @@ static int xc_write_reg(struct xc4000_priv *priv, u16 regAddr, u16 i2cData) | |||
318 | buf[2] = (i2cData >> 8) & 0xFF; | 316 | buf[2] = (i2cData >> 8) & 0xFF; |
319 | buf[3] = i2cData & 0xFF; | 317 | buf[3] = i2cData & 0xFF; |
320 | result = xc_send_i2c_data(priv, buf, 4); | 318 | result = xc_send_i2c_data(priv, buf, 4); |
321 | //WAS THERE | ||
322 | // if (result == XC_RESULT_SUCCESS) { | ||
323 | // /* wait for busy flag to clear */ | ||
324 | // while ((WatchDogTimer > 0) && (result == XC_RESULT_SUCCESS)) { | ||
325 | // buf[0] = 0; | ||
326 | // buf[1] = XREG_BUSY; | ||
327 | // | ||
328 | // result = xc_send_i2c_data(priv, buf, 2); | ||
329 | // if (result == XC_RESULT_SUCCESS) { | ||
330 | // result = xc_read_i2c_data(priv, buf, 2); | ||
331 | // if (result == XC_RESULT_SUCCESS) { | ||
332 | // if ((buf[0] == 0) && (buf[1] == 0)) { | ||
333 | // /* busy flag cleared */ | ||
334 | // break; | ||
335 | // } else { | ||
336 | // xc_wait(5); /* wait 5 ms */ | ||
337 | // WatchDogTimer--; | ||
338 | // } | ||
339 | // } | ||
340 | // } | ||
341 | // } | ||
342 | // } | ||
343 | // if (WatchDogTimer < 0) | ||
344 | // result = XC_RESULT_I2C_WRITE_FAILURE; | ||
345 | 319 | ||
346 | return result; | 320 | return result; |
347 | } | 321 | } |