leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (11847): saa7134: Simplify handling of IR on MSI TV@nywhere Plus

Browse Source 
Now that we instantiate I2C IR devices explicitly, we can skip probing
altogether on boards where the I2C IR device address is known. The MSI
TV@nywhere Plus is one of these boards.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jean Delvare 2009-05-13 16:51:46 -03:00 committed by Mauro Carvalho Chehab
parent 9a4cc5ac99
commit ec218a412b
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/media/video/saa7134/saa7134-input.c
View File

@ -691,9 +691,6 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
I2C_CLIENT_END I2C_CLIENT_END
}; };
const unsigned short addr_list_msi[] = {
0x30, I2C_CLIENT_END
};
struct i2c_msg msg_msi = { struct i2c_msg msg_msi = {
.addr = 0x50, .addr = 0x50,
.flags = I2C_M_RD, .flags = I2C_M_RD,
@ -747,6 +744,15 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
init_data.name = "MSI TV@nywhere Plus"; init_data.name = "MSI TV@nywhere Plus";
init_data.get_key = get_key_msi_tvanywhere_plus; init_data.get_key = get_key_msi_tvanywhere_plus;
init_data.ir_codes = ir_codes_msi_tvanywhere_plus; init_data.ir_codes = ir_codes_msi_tvanywhere_plus;
info.addr = 0x30;
/* MSI TV@nywhere Plus controller doesn't seem to
respond to probes unless we read something from
an existing device. Weird...
REVISIT: might no longer be needed */
rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1);
dprintk(KERN_DEBUG "probe 0x%02x @ %s: %s\n",
msg_msi.addr, dev->i2c_adap.name,
(1 == rc) ? "yes" : "no");
break; break;
case SAA7134_BOARD_HAUPPAUGE_HVR1110: case SAA7134_BOARD_HAUPPAUGE_HVR1110:
init_data.name = "HVR 1110"; init_data.name = "HVR 1110";
@ -773,18 +779,14 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
if (init_data.name) if (init_data.name)
info.platform_data = &init_data; info.platform_data = &init_data;
client = i2c_new_probed_device(&dev->i2c_adap, &info, addr_list); /* No need to probe if address is known */
if (client) if (info.addr) {
i2c_new_device(&dev->i2c_adap, &info);
return; return;
}
/* MSI TV@nywhere Plus controller doesn't seem to /* Address not known, fallback to probing */
respond to probes unless we read something from client = i2c_new_probed_device(&dev->i2c_adap, &info, addr_list);
an existing device. Weird... */
rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1);
dprintk(KERN_DEBUG "probe 0x%02x @ %s: %s\n",
msg_msi.addr, dev->i2c_adap.name,
(1 == rc) ? "yes" : "no");
client = i2c_new_probed_device(&dev->i2c_adap, &info, addr_list_msi);
if (client) if (client)
return; return;