diff options
author | Ezequiel GarcĂa <elezegarcia@gmail.com> | 2012-06-27 11:52:48 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-30 18:52:52 -0400 |
commit | 272863540371cd86a7f05d6fef7db7868ea79a2e (patch) | |
tree | 454e0c46a9ceaacb78ba4d11136032070e7de8c3 | |
parent | c410d09bf3c8019d50d5ce7f1eb26e1b747835f7 (diff) |
[media] cx231xx: Remove useless struct i2c_algo_bit_data
The field 'struct i2c_algo_bit_data i2c_algo' is wrongly confused with
struct i2c_algorithm. Moreover, i2c_algo field is not used since
i2c is registered using i2c_add_adpater() and not i2c_bit_add_bus().
Therefore, it's safe to remove it.
Tested by compilation only.
Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx-i2c.c | 2 | ||||
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-i2c.c b/drivers/media/video/cx231xx/cx231xx-i2c.c index 925f3a04e53c..7c0ed1bc49c2 100644 --- a/drivers/media/video/cx231xx/cx231xx-i2c.c +++ b/drivers/media/video/cx231xx/cx231xx-i2c.c | |||
@@ -500,7 +500,6 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus) | |||
500 | BUG_ON(!dev->cx231xx_send_usb_command); | 500 | BUG_ON(!dev->cx231xx_send_usb_command); |
501 | 501 | ||
502 | memcpy(&bus->i2c_adap, &cx231xx_adap_template, sizeof(bus->i2c_adap)); | 502 | memcpy(&bus->i2c_adap, &cx231xx_adap_template, sizeof(bus->i2c_adap)); |
503 | memcpy(&bus->i2c_algo, &cx231xx_algo, sizeof(bus->i2c_algo)); | ||
504 | memcpy(&bus->i2c_client, &cx231xx_client_template, | 503 | memcpy(&bus->i2c_client, &cx231xx_client_template, |
505 | sizeof(bus->i2c_client)); | 504 | sizeof(bus->i2c_client)); |
506 | 505 | ||
@@ -508,7 +507,6 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus) | |||
508 | 507 | ||
509 | strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name)); | 508 | strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name)); |
510 | 509 | ||
511 | bus->i2c_algo.data = bus; | ||
512 | bus->i2c_adap.algo_data = bus; | 510 | bus->i2c_adap.algo_data = bus; |
513 | i2c_set_adapdata(&bus->i2c_adap, &dev->v4l2_dev); | 511 | i2c_set_adapdata(&bus->i2c_adap, &dev->v4l2_dev); |
514 | i2c_add_adapter(&bus->i2c_adap); | 512 | i2c_add_adapter(&bus->i2c_adap); |
diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h index e17447554a0d..a89d020de948 100644 --- a/drivers/media/video/cx231xx/cx231xx.h +++ b/drivers/media/video/cx231xx/cx231xx.h | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/types.h> | 26 | #include <linux/types.h> |
27 | #include <linux/ioctl.h> | 27 | #include <linux/ioctl.h> |
28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
29 | #include <linux/i2c-algo-bit.h> | ||
30 | #include <linux/workqueue.h> | 29 | #include <linux/workqueue.h> |
31 | #include <linux/mutex.h> | 30 | #include <linux/mutex.h> |
32 | 31 | ||
@@ -481,7 +480,6 @@ struct cx231xx_i2c { | |||
481 | 480 | ||
482 | /* i2c i/o */ | 481 | /* i2c i/o */ |
483 | struct i2c_adapter i2c_adap; | 482 | struct i2c_adapter i2c_adap; |
484 | struct i2c_algo_bit_data i2c_algo; | ||
485 | struct i2c_client i2c_client; | 483 | struct i2c_client i2c_client; |
486 | u32 i2c_rc; | 484 | u32 i2c_rc; |
487 | 485 | ||