From cf3393fbd8024a5ced374c2a0c7de088fa89c786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ezequiel=20Garc=C3=ADa?= Date: Wed, 27 Jun 2012 12:52:46 -0300 Subject: [PATCH] --- yaml --- r: 320640 b: refs/heads/master c: 6fe31039d40d73968fe75c543d6b623bcbf5ecb9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7164/saa7164-i2c.c | 4 ---- trunk/drivers/media/video/saa7164/saa7164.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 69ab654aacb6..14eceb7043b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1367f1b260d29e9b9fb20d8e2f39f1e74fa6c3b +refs/heads/master: 6fe31039d40d73968fe75c543d6b623bcbf5ecb9 diff --git a/trunk/drivers/media/video/saa7164/saa7164-i2c.c b/trunk/drivers/media/video/saa7164/saa7164-i2c.c index 26148f76cba2..1c54ab47fb62 100644 --- a/trunk/drivers/media/video/saa7164/saa7164-i2c.c +++ b/trunk/drivers/media/video/saa7164/saa7164-i2c.c @@ -109,9 +109,6 @@ int saa7164_i2c_register(struct saa7164_i2c *bus) memcpy(&bus->i2c_adap, &saa7164_i2c_adap_template, sizeof(bus->i2c_adap)); - memcpy(&bus->i2c_algo, &saa7164_i2c_algo_template, - sizeof(bus->i2c_algo)); - memcpy(&bus->i2c_client, &saa7164_i2c_client_template, sizeof(bus->i2c_client)); @@ -120,7 +117,6 @@ int saa7164_i2c_register(struct saa7164_i2c *bus) strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name)); - bus->i2c_algo.data = bus; bus->i2c_adap.algo_data = bus; i2c_set_adapdata(&bus->i2c_adap, bus); i2c_add_adapter(&bus->i2c_adap); diff --git a/trunk/drivers/media/video/saa7164/saa7164.h b/trunk/drivers/media/video/saa7164/saa7164.h index 8d120e3baf70..fc1f854cbe89 100644 --- a/trunk/drivers/media/video/saa7164/saa7164.h +++ b/trunk/drivers/media/video/saa7164/saa7164.h @@ -251,7 +251,6 @@ struct saa7164_i2c { /* I2C I/O */ struct i2c_adapter i2c_adap; - struct i2c_algo_bit_data i2c_algo; struct i2c_client i2c_client; u32 i2c_rc; };