Skip to content

Commit

Permalink
[media] xc4000: remove XREG_BUSY code only supported in xc5000
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Devin Heitmueller authored and Mauro Carvalho Chehab committed Jul 27, 2011
1 parent 6bf60d5 commit 02dec50
Showing 1 changed file with 0 additions and 26 deletions.
26 changes: 0 additions & 26 deletions drivers/media/common/tuners/xc4000.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

/*
Expand Down Expand Up @@ -310,38 +309,13 @@ 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;
buf[1] = regAddr & 0xFF;
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;
}
Expand Down

0 comments on commit 02dec50

Please sign in to comment.