Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27286354 authored by Ezequiel García's avatar Ezequiel García Committed by Mauro Carvalho Chehab
Browse files

[media] cx231xx: 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: default avatarEzequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent c410d09b

drivers/media/video/cx231xx/cx231xx-i2c.c

+0 −2
Original line number Diff line number Diff line
@@ -500,7 +500,6 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus) 
	BUG_ON(!dev->cx231xx_send_usb_command);



	memcpy(&bus->i2c_adap, &cx231xx_adap_template, sizeof(bus->i2c_adap));

	memcpy(&bus->i2c_algo, &cx231xx_algo, sizeof(bus->i2c_algo));

	memcpy(&bus->i2c_client, &cx231xx_client_template,

	       sizeof(bus->i2c_client));
@@ -508,7 +507,6 @@ int cx231xx_i2c_register(struct cx231xx_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);

drivers/media/video/cx231xx/cx231xx.h

+0 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/types.h>

#include <linux/ioctl.h>

#include <linux/i2c.h>

#include <linux/i2c-algo-bit.h>

#include <linux/workqueue.h>

#include <linux/mutex.h>
@@ -481,7 +480,6 @@ struct cx231xx_i2c { 


	/* i2c i/o */

	struct i2c_adapter i2c_adap;

	struct i2c_algo_bit_data i2c_algo;

	struct i2c_client i2c_client;

	u32 i2c_rc;