From d42bb3b93c461a18acb8883d29e7ece67929ae22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ezequiel=20Garc=C3=ADa?= Date: Wed, 27 Jun 2012 12:52:49 -0300 Subject: [PATCH] --- yaml --- r: 320643 b: refs/heads/master c: b26f453963a5275a5c408beee7663d5bc096620f h: refs/heads/master i: 320641: b64a686a7ddedde6d3223f2425076ad6045011f7 320639: 4eae4a9e6fdf16e89347f3df8d591dbae30943e5 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx25821/cx25821-i2c.c | 3 --- trunk/drivers/media/video/cx25821/cx25821.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c82488e14860..27e4c095c440 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 272863540371cd86a7f05d6fef7db7868ea79a2e +refs/heads/master: b26f453963a5275a5c408beee7663d5bc096620f diff --git a/trunk/drivers/media/video/cx25821/cx25821-i2c.c b/trunk/drivers/media/video/cx25821/cx25821-i2c.c index 6311180f430c..0a44b4ea1cec 100644 --- a/trunk/drivers/media/video/cx25821/cx25821-i2c.c +++ b/trunk/drivers/media/video/cx25821/cx25821-i2c.c @@ -307,8 +307,6 @@ int cx25821_i2c_register(struct cx25821_i2c *bus) memcpy(&bus->i2c_adap, &cx25821_i2c_adap_template, sizeof(bus->i2c_adap)); - memcpy(&bus->i2c_algo, &cx25821_i2c_algo_template, - sizeof(bus->i2c_algo)); memcpy(&bus->i2c_client, &cx25821_i2c_client_template, sizeof(bus->i2c_client)); @@ -316,7 +314,6 @@ int cx25821_i2c_register(struct cx25821_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, &dev->v4l2_dev); i2c_add_adapter(&bus->i2c_adap); diff --git a/trunk/drivers/media/video/cx25821/cx25821.h b/trunk/drivers/media/video/cx25821/cx25821.h index b9aa801b00a7..ed525016f165 100644 --- a/trunk/drivers/media/video/cx25821/cx25821.h +++ b/trunk/drivers/media/video/cx25821/cx25821.h @@ -26,7 +26,6 @@ #include #include -#include #include #include #include @@ -213,7 +212,6 @@ struct cx25821_i2c { /* i2c i/o */ struct i2c_adapter i2c_adap; - struct i2c_algo_bit_data i2c_algo; struct i2c_client i2c_client; u32 i2c_rc;