lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] cx231xx: Use a generic check for TUNER_XC5000

Browse Source 
The check for xc5000 assumes that the tuner will always
be using the same bus and will have the same address.
As those are configurable via dev->board, it should use,
instead, the values defined there.

Also, a similar type of test will be needed by other
tuners (for example, for TUNER_XC2028)

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab
2011-01-30 09:03:24 -03:00
parent 8bb84227d1
commit 3f25ffa2cd
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/media/video/cx231xx/cx231xx-i2c.c
View File

@@ -54,6 +54,21 @@ do { \
} \ } \
} while (0) } while (0)
static inline bool is_tuner(struct cx231xx *dev, struct cx231xx_i2c *bus,
const struct i2c_msg *msg, int tuner_type)
{
if (bus->nr != dev->board.tuner_i2c_master)
return false;
if (msg->addr != dev->board.tuner_addr)
return false;
if (dev->tuner_type != tuner_type)
return false;
return true;
}
/* /*
* cx231xx_i2c_send_bytes() * cx231xx_i2c_send_bytes()
*/ */
@@ -71,9 +86,7 @@ int cx231xx_i2c_send_bytes(struct i2c_adapter *i2c_adap,
u16 saddr = 0; u16 saddr = 0;
u8 need_gpio = 0; u8 need_gpio = 0;
if ((bus->nr == 1) && (msg->addr == 0x61) if (is_tuner(dev, bus, msg, TUNER_XC5000)) {
&& (dev->tuner_type == TUNER_XC5000)) {
size = msg->len; size = msg->len;
if (size == 2) { /* register write sub addr */ if (size == 2) { /* register write sub addr */
@@ -180,9 +193,7 @@ static int cx231xx_i2c_recv_bytes(struct i2c_adapter *i2c_adap,
u16 saddr = 0; u16 saddr = 0;
u8 need_gpio = 0; u8 need_gpio = 0;
if ((bus->nr == 1) && (msg->addr == 0x61) if (is_tuner(dev, bus, msg, TUNER_XC5000)) {
&& dev->tuner_type == TUNER_XC5000) {
if (msg->len == 2) if (msg->len == 2)
saddr = msg->buf[0] << 8 | msg->buf[1]; saddr = msg->buf[0] << 8 | msg->buf[1];
else if (msg->len == 1) else if (msg->len == 1)
@@ -274,9 +285,7 @@ static int cx231xx_i2c_recv_bytes_with_saddr(struct i2c_adapter *i2c_adap,
else if (msg1->len == 1) else if (msg1->len == 1)
saddr = msg1->buf[0]; saddr = msg1->buf[0];
if ((bus->nr == 1) && (msg2->addr == 0x61) if (is_tuner(dev, bus, msg2, TUNER_XC5000)) {
&& dev->tuner_type == TUNER_XC5000) {
if ((msg2->len < 16)) { if ((msg2->len < 16)) {
dprintk1(1, dprintk1(1,
@@ -454,8 +463,8 @@ static char *i2c_devs[128] = {
[0x32 >> 1] = "GeminiIII", [0x32 >> 1] = "GeminiIII",
[0x02 >> 1] = "Aquarius", [0x02 >> 1] = "Aquarius",
[0xa0 >> 1] = "eeprom", [0xa0 >> 1] = "eeprom",
[0xc0 >> 1] = "tuner/XC3028", [0xc0 >> 1] = "tuner",
[0xc2 >> 1] = "tuner/XC5000", [0xc2 >> 1] = "tuner",
}; };
/* /*