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

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

[media] cx25821: 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 27286354

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

+0 −3
Original line number Diff line number Diff line
@@ -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);

drivers/media/video/cx25821/cx25821.h

+0 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 


#include <linux/pci.h>

#include <linux/i2c.h>

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

#include <linux/interrupt.h>

#include <linux/delay.h>

#include <linux/sched.h>
@@ -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;