diff options
author | Jean Delvare <khali@linux-fr.org> | 2009-05-13 15:49:32 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 17:21:11 -0400 |
commit | 4d7a2d6721a6380d4ffc26d81d2c8232fd0d2dfc (patch) | |
tree | 5ccac1dc6084363abdea5a63fe5d305421bd894c /drivers/media/video/saa7134/saa7134-i2c.c | |
parent | c668f32dca105d876e51862a003a302fa61e4ae4 (diff) |
V4L/DVB (11845): ir-kbd-i2c: Use initialization data
For specific boards, pass initialization data to ir-kbd-i2c instead
of modifying the settings after the device is initialized. This is
more efficient and easier to read.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-i2c.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-i2c.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c index a96f75985cba..a8a355e28799 100644 --- a/drivers/media/video/saa7134/saa7134-i2c.c +++ b/drivers/media/video/saa7134/saa7134-i2c.c | |||
@@ -321,33 +321,6 @@ static u32 functionality(struct i2c_adapter *adap) | |||
321 | return I2C_FUNC_SMBUS_EMUL; | 321 | return I2C_FUNC_SMBUS_EMUL; |
322 | } | 322 | } |
323 | 323 | ||
324 | static int attach_inform(struct i2c_client *client) | ||
325 | { | ||
326 | struct saa7134_dev *dev = client->adapter->algo_data; | ||
327 | |||
328 | d1printk( "%s i2c attach [addr=0x%x,client=%s]\n", | ||
329 | client->driver->driver.name, client->addr, client->name); | ||
330 | |||
331 | /* Am I an i2c remote control? */ | ||
332 | |||
333 | switch (client->addr) { | ||
334 | case 0x7a: | ||
335 | case 0x47: | ||
336 | case 0x71: | ||
337 | case 0x2d: | ||
338 | case 0x30: | ||
339 | { | ||
340 | struct IR_i2c *ir = i2c_get_clientdata(client); | ||
341 | d1printk("%s i2c IR detected (%s).\n", | ||
342 | client->driver->driver.name, ir->phys); | ||
343 | saa7134_set_i2c_ir(dev,ir); | ||
344 | break; | ||
345 | } | ||
346 | } | ||
347 | |||
348 | return 0; | ||
349 | } | ||
350 | |||
351 | static struct i2c_algorithm saa7134_algo = { | 324 | static struct i2c_algorithm saa7134_algo = { |
352 | .master_xfer = saa7134_i2c_xfer, | 325 | .master_xfer = saa7134_i2c_xfer, |
353 | .functionality = functionality, | 326 | .functionality = functionality, |
@@ -358,7 +331,6 @@ static struct i2c_adapter saa7134_adap_template = { | |||
358 | .name = "saa7134", | 331 | .name = "saa7134", |
359 | .id = I2C_HW_SAA7134, | 332 | .id = I2C_HW_SAA7134, |
360 | .algo = &saa7134_algo, | 333 | .algo = &saa7134_algo, |
361 | .client_register = attach_inform, | ||
362 | }; | 334 | }; |
363 | 335 | ||
364 | static struct i2c_client saa7134_client_template = { | 336 | static struct i2c_client saa7134_client_template = { |