From: Frank Schaefer Date: Sun, 11 May 2014 20:29:07 +0000 (-0300) Subject: [media] em28xx: remove the i2c_set_adapdata() call in em28xx_i2c_register() X-Git-Tag: next-20140530~82^2~4^2~102 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aa4ce5f7f3ced49f6b0986b08d529c7ed336b508;p=karo-tx-linux.git [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 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c index ba6433c3a643..b58d4ebf6419 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) {