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

Commit 23b0e41b authored by Matthias Schwarzott's avatar Matthias Schwarzott Committed by Mauro Carvalho Chehab
Browse files

[media] cx231xx: delete i2c_client per bus 



For each i2c master there is a i2c_client allocated that could be
deleted now that its only two users have been changed to use their
own i2c_client.

Signed-off-by: default avatarMatthias Schwarzott <zzam@gentoo.org>
Reviewed-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 9c672890

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

+0 −7
Original line number Diff line number Diff line
@@ -455,10 +455,6 @@ static struct i2c_adapter cx231xx_adap_template = { 
	.algo = &cx231xx_algo,

};



static struct i2c_client cx231xx_client_template = {

	.name = "cx231xx internal",

};



/* ----------------------------------------------------------- */



/*
@@ -514,7 +510,6 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus) 
	BUG_ON(!dev->cx231xx_send_usb_command);



	bus->i2c_adap = cx231xx_adap_template;

	bus->i2c_client = cx231xx_client_template;

	bus->i2c_adap.dev.parent = &dev->udev->dev;



	strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name));
@@ -523,8 +518,6 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus) 
	i2c_set_adapdata(&bus->i2c_adap, &dev->v4l2_dev);

	i2c_add_adapter(&bus->i2c_adap);



	bus->i2c_client.adapter = &bus->i2c_adap;



	if (0 == bus->i2c_rc) {

		if (i2c_scan)

			cx231xx_do_i2c_scan(dev, bus->nr);

drivers/media/usb/cx231xx/cx231xx.h

+0 −1
Original line number Diff line number Diff line
@@ -472,7 +472,6 @@ struct cx231xx_i2c { 


	/* i2c i/o */

	struct i2c_adapter i2c_adap;

	struct i2c_client i2c_client;

	u32 i2c_rc;



	/* different settings for each bus */