diff options
author | Ezequiel GarcĂa <elezegarcia@gmail.com> | 2012-06-27 11:52:46 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-30 18:52:22 -0400 |
commit | 6fe31039d40d73968fe75c543d6b623bcbf5ecb9 (patch) | |
tree | dc39703f3cef413c802969ef0ab07dce59fad7ec | |
parent | a1367f1b260d29e9b9fb20d8e2f39f1e74fa6c3b (diff) |
[media] saa7164: 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/saa7164/saa7164-i2c.c | 4 | ||||
-rw-r--r-- | drivers/media/video/saa7164/saa7164.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/video/saa7164/saa7164-i2c.c b/drivers/media/video/saa7164/saa7164-i2c.c index 26148f76cba..1c54ab47fb6 100644 --- a/drivers/media/video/saa7164/saa7164-i2c.c +++ b/drivers/media/video/saa7164/saa7164-i2c.c | |||
@@ -109,9 +109,6 @@ int saa7164_i2c_register(struct saa7164_i2c *bus) | |||
109 | memcpy(&bus->i2c_adap, &saa7164_i2c_adap_template, | 109 | memcpy(&bus->i2c_adap, &saa7164_i2c_adap_template, |
110 | sizeof(bus->i2c_adap)); | 110 | sizeof(bus->i2c_adap)); |
111 | 111 | ||
112 | memcpy(&bus->i2c_algo, &saa7164_i2c_algo_template, | ||
113 | sizeof(bus->i2c_algo)); | ||
114 | |||
115 | memcpy(&bus->i2c_client, &saa7164_i2c_client_template, | 112 | memcpy(&bus->i2c_client, &saa7164_i2c_client_template, |
116 | sizeof(bus->i2c_client)); | 113 | sizeof(bus->i2c_client)); |
117 | 114 | ||
@@ -120,7 +117,6 @@ int saa7164_i2c_register(struct saa7164_i2c *bus) | |||
120 | strlcpy(bus->i2c_adap.name, bus->dev->name, | 117 | strlcpy(bus->i2c_adap.name, bus->dev->name, |
121 | sizeof(bus->i2c_adap.name)); | 118 | sizeof(bus->i2c_adap.name)); |
122 | 119 | ||
123 | bus->i2c_algo.data = bus; | ||
124 | bus->i2c_adap.algo_data = bus; | 120 | bus->i2c_adap.algo_data = bus; |
125 | i2c_set_adapdata(&bus->i2c_adap, bus); | 121 | i2c_set_adapdata(&bus->i2c_adap, bus); |
126 | i2c_add_adapter(&bus->i2c_adap); | 122 | i2c_add_adapter(&bus->i2c_adap); |
diff --git a/drivers/media/video/saa7164/saa7164.h b/drivers/media/video/saa7164/saa7164.h index 8d120e3baf7..fc1f854cbe8 100644 --- a/drivers/media/video/saa7164/saa7164.h +++ b/drivers/media/video/saa7164/saa7164.h | |||
@@ -251,7 +251,6 @@ struct saa7164_i2c { | |||
251 | 251 | ||
252 | /* I2C I/O */ | 252 | /* I2C I/O */ |
253 | struct i2c_adapter i2c_adap; | 253 | struct i2c_adapter i2c_adap; |
254 | struct i2c_algo_bit_data i2c_algo; | ||
255 | struct i2c_client i2c_client; | 254 | struct i2c_client i2c_client; |
256 | u32 i2c_rc; | 255 | u32 i2c_rc; |
257 | }; | 256 | }; |