V4L/DVB: saa7134: get rid of I2C_HW_SAA7134

The only reason for keeping I2C_HW_SAA7134 is to allow setting a
per-device polling interval. Just move this info to the platform
data, allowing drivers to change it per device, where needed.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 5 insertions, 1 deletions

diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index da41b6b1e64a..2d3f6d265bbf 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -328,7 +328,6 @@ static struct i2c_algorithm saa7134_algo = {
 static struct i2c_adapter saa7134_adap_template = {
         .owner         = THIS_MODULE,
         .name          = "saa7134",
-        .id            = I2C_HW_SAA7134,
         .algo          = &saa7134_algo,
 };
 
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 0b336ca6d55b..52a1ee5aefd0 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -959,6 +959,11 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
                 dev->init_data.name = "MSI TV@nywhere Plus";
                 dev->init_data.get_key = get_key_msi_tvanywhere_plus;
                 dev->init_data.ir_codes = RC_MAP_MSI_TVANYWHERE_PLUS;
+                /*
+                 * MSI TV@nyware Plus requires more frequent polling
+                 * otherwise it will miss some keypresses
+                 */
+                dev->init_data.polling_interval = 50;
                 info.addr = 0x30;
                 /* MSI TV@nywhere Plus controller doesn't seem to
                    respond to probes unless we read something from