redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

saa7164: Fix CodingStyle issues added on previous patches

Browse source 
The patches that added support for HVR2255 and HVR2205 added
some CodingStyle issues.

Better to fix it sooner than latter.

Cc: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2015-05-01 07:30:40 -03:00
parent 534bc3e2ee
commit 3600433f19
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/media/pci/saa7164/saa7164-api.c
View file

@ -1467,7 +1467,8 @@ int saa7164_api_i2c_write(struct saa7164_i2c *bus, u8 addr, u32 datalen,
return -EIO;
}
dprintk(DBGLVL_API, "%s() len = %d bytes unitid=0x%x\n", __func__, len, unitid);
dprintk(DBGLVL_API, "%s() len = %d bytes unitid=0x%x\n", __func__,
len, unitid);
/* Prepare the send buffer */
/* Bytes 00-03 dest register length

34
drivers/media/pci/saa7164/saa7164-dvb.c
View file

@ -629,11 +629,13 @@ int saa7164_dvb_register(struct saa7164_port *port)
if (port->dvb.frontend != NULL) {
if (port->nr == 0) {
si2157_attach(port, &dev->i2c_bus[0].i2c_adap, port->dvb.frontend,
0xc0, &hauppauge_hvr2255_tuner_config);
si2157_attach(port, &dev->i2c_bus[0].i2c_adap,
port->dvb.frontend, 0xc0,
&hauppauge_hvr2255_tuner_config);
} else {
si2157_attach(port, &dev->i2c_bus[1].i2c_adap, port->dvb.frontend,
0xc0, &hauppauge_hvr2255_tuner_config);
si2157_attach(port, &dev->i2c_bus[1].i2c_adap,
port->dvb.frontend, 0xc0,
&hauppauge_hvr2255_tuner_config);
}
}
break;
@ -650,10 +652,11 @@ int saa7164_dvb_register(struct saa7164_port *port)
info.addr = 0xc8 >> 1;
info.platform_data = &si2168_config;
request_module(info.type);
client_demod = i2c_new_device(&dev->i2c_bus[2].i2c_adap, &info);
if (client_demod == NULL || client_demod->dev.driver == NULL) {
client_demod = i2c_new_device(&dev->i2c_bus[2].i2c_adap,
&info);
if (!client_demod || !client_demod->dev.driver)
goto frontend_detach;
}
if (!try_module_get(client_demod->dev.driver->owner)) {
i2c_unregister_device(client_demod);
goto frontend_detach;
@ -668,8 +671,9 @@ int saa7164_dvb_register(struct saa7164_port *port)
info.addr = 0xc0 >> 1;
info.platform_data = &si2157_config;
request_module(info.type);
client_tuner = i2c_new_device(&dev->i2c_bus[0].i2c_adap, &info);
if (client_tuner == NULL || client_tuner->dev.driver == NULL) {
client_tuner = i2c_new_device(&dev->i2c_bus[0].i2c_adap,
&info);
if (!client_tuner || !client_tuner->dev.driver) {
module_put(client_demod->dev.driver->owner);
i2c_unregister_device(client_demod);
goto frontend_detach;
@ -692,10 +696,11 @@ int saa7164_dvb_register(struct saa7164_port *port)
info.addr = 0xcc >> 1;
info.platform_data = &si2168_config;
request_module(info.type);
client_demod = i2c_new_device(&dev->i2c_bus[2].i2c_adap, &info);
if (client_demod == NULL || client_demod->dev.driver == NULL) {
client_demod = i2c_new_device(&dev->i2c_bus[2].i2c_adap,
&info);
if (!client_tuner || !client_tuner->dev.driver)
goto frontend_detach;
}
if (!try_module_get(client_demod->dev.driver->owner)) {
i2c_unregister_device(client_demod);
goto frontend_detach;
@ -710,8 +715,9 @@ int saa7164_dvb_register(struct saa7164_port *port)
info.addr = 0xc0 >> 1;
info.platform_data = &si2157_config;
request_module(info.type);
client_tuner = i2c_new_device(&dev->i2c_bus[1].i2c_adap, &info);
if (client_tuner == NULL || client_tuner->dev.driver == NULL) {
client_tuner = i2c_new_device(&dev->i2c_bus[1].i2c_adap,
&info);
if (!client_tuner || !client_tuner->dev.driver) {
module_put(client_demod->dev.driver->owner);
i2c_unregister_device(client_demod);
goto frontend_detach;