From: Frank Schaefer <fschaefer.oss@googlemail.com>
Date: Sun, 11 May 2014 20:29:07 +0000 (-0300)
Subject: upstream: [media] em28xx: remove the i2c_set_adapdata() call in em28xx_i2c_register()
X-Git-Tag: submit/tizen/20141121.110247~749
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6650aa377bcb121249df7043bd00b5e3b9bede5;p=platform%2Fkernel%2Flinux-3.10.git

upstream: [media] em28xx: remove the i2c_set_adapdata() call in em28xx_i2c_register()

It is no longer needed since nobody is calling i2c_get_adapdata() anymore.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---

diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c
index ba6433c..b58d4eb 100644
--- a/drivers/media/usb/em28xx/em28xx-i2c.c
+++ b/drivers/media/usb/em28xx/em28xx-i2c.c
@@ -939,7 +939,6 @@ int em28xx_i2c_register(struct em28xx *dev, unsigned bus,
 	dev->i2c_bus[bus].algo_type = algo_type;
 	dev->i2c_bus[bus].dev = dev;
 	dev->i2c_adap[bus].algo_data = &dev->i2c_bus[bus];
-	i2c_set_adapdata(&dev->i2c_adap[bus], &dev->v4l2_dev);
 
 	retval = i2c_add_adapter(&dev->i2c_adap[bus]);
 	if (retval < 0) {