saa7164: Fix CodingStyle issues added on previous patches

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>

diff --git a/drivers/media/pci/saa7164/saa7164-api.c b/drivers/media/pci/saa7164/saa7164-api.c
index a992af6e43a4643576b17fe8aefd18d18f38be11..e8077037fb5c785f0fdaf947dba7482e8b20a2a0 100644 (file)
--- a/drivers/media/pci/saa7164/saa7164-api.c
+++ b/drivers/media/pci/saa7164/saa7164-api.c
@@ -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

diff --git a/drivers/media/pci/saa7164/saa7164-dvb.c b/drivers/media/pci/saa7164/saa7164-dvb.c
index 0fdc9447a0fee43ce31f37e7aa3cba219305dfb0..c68ce2631e8f13fb1d164e19d69ab46dfe8bc0d7 100644 (file)
--- a/drivers/media/pci/saa7164/saa7164-dvb.c
+++ b/drivers/media/pci/saa7164/saa7164-dvb.c
@@ -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;