android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] cx231xx: let i2c bus scanning use its own i2c_client

Browse Source 
This is a preparation for deleting the otherwise useless i2c_clients
that are allocated for all the i2c master adapters.

Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Matthias Schwarzott
2014-10-02 02:20:53 -03:00
committed by Mauro Carvalho Chehab
parent 37fa8716e2
commit 7c894a3b34
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/media/usb/cx231xx/cx231xx-i2c.c
View File

@ -480,22 +480,27 @@ static char *i2c_devs[128] = {
* cx231xx_do_i2c_scan() * cx231xx_do_i2c_scan()
* check i2c address range for devices * check i2c address range for devices
*/ */
void cx231xx_do_i2c_scan(struct cx231xx *dev, struct i2c_client *c) void cx231xx_do_i2c_scan(struct cx231xx *dev, int i2c_port)
{ {
unsigned char buf; unsigned char buf;
int i, rc; int i, rc;
struct i2c_client client;
cx231xx_info(": Checking for I2C devices ..\n"); memset(&client, 0, sizeof(client));
client.adapter = &dev->i2c_bus[i2c_port].i2c_adap;
cx231xx_info(": Checking for I2C devices on port=%d ..\n", i2c_port);
for (i = 0; i < 128; i++) { for (i = 0; i < 128; i++) {
c->addr = i; client.addr = i;
rc = i2c_master_recv(c, &buf, 0); rc = i2c_master_recv(&client, &buf, 0);
if (rc < 0) if (rc < 0)
continue; continue;
cx231xx_info("%s: i2c scan: found device @ 0x%x [%s]\n", cx231xx_info("%s: i2c scan: found device @ 0x%x [%s]\n",
dev->name, i << 1, dev->name, i << 1,
i2c_devs[i] ? i2c_devs[i] : "???"); i2c_devs[i] ? i2c_devs[i] : "???");
} }
cx231xx_info(": Completed Checking for I2C devices.\n"); cx231xx_info(": Completed Checking for I2C devices on port=%d.\n",
i2c_port);
} }
/* /*
@ -522,7 +527,7 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus)
if (0 == bus->i2c_rc) { if (0 == bus->i2c_rc) {
if (i2c_scan) if (i2c_scan)
cx231xx_do_i2c_scan(dev, &bus->i2c_client); cx231xx_do_i2c_scan(dev, bus->nr);
} else } else
cx231xx_warn("%s: i2c bus %d register FAILED\n", cx231xx_warn("%s: i2c bus %d register FAILED\n",
dev->name, bus->nr); dev->name, bus->nr);

2
drivers/media/usb/cx231xx/cx231xx.h
View File

@ -751,7 +751,7 @@ int cx231xx_set_analog_freq(struct cx231xx *dev, u32 freq);
int cx231xx_reset_analog_tuner(struct cx231xx *dev); int cx231xx_reset_analog_tuner(struct cx231xx *dev);
/* Provided by cx231xx-i2c.c */ /* Provided by cx231xx-i2c.c */
void cx231xx_do_i2c_scan(struct cx231xx *dev, struct i2c_client *c); void cx231xx_do_i2c_scan(struct cx231xx *dev, int i2c_port);
int cx231xx_i2c_register(struct cx231xx_i2c *bus); int cx231xx_i2c_register(struct cx231xx_i2c *bus);
int cx231xx_i2c_unregister(struct cx231xx_i2c *bus); int cx231xx_i2c_unregister(struct cx231xx_i2c *bus);