media: dw2102: Fix minor issues

Found by checkpatch.

Link: https://lore.kernel.org/linux-media/20220116112238.74171-4-micha@freedict.org
Signed-off-by: Michael Bunk <micha@freedict.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
index 598185c516fa6b6d9b1298a740a0dafdf054f763..8077d5584b6b70b6b148206b677bd1735f5fecdb 100644 (file)
--- a/drivers/media/usb/dvb-usb/dw2102.c
+++ b/drivers/media/usb/dvb-usb/dw2102.c
@@ -53,10 +53,10 @@
 #define DW2102_FIRMWARE "dvb-usb-dw2102.fw"
 #define DW2104_FIRMWARE "dvb-usb-dw2104.fw"
 #define DW3101_FIRMWARE "dvb-usb-dw3101.fw"
-#define S630_FIRMWARE   "dvb-usb-s630.fw"
-#define S660_FIRMWARE   "dvb-usb-s660.fw"
-#define P1100_FIRMWARE  "dvb-usb-p1100.fw"
-#define P7500_FIRMWARE  "dvb-usb-p7500.fw"
+#define S630_FIRMWARE  "dvb-usb-s630.fw"
+#define S660_FIRMWARE  "dvb-usb-s660.fw"
+#define P1100_FIRMWARE "dvb-usb-p1100.fw"
+#define P7500_FIRMWARE "dvb-usb-p7500.fw"
 
 #define        err_str "did not find the firmware file '%s'. You can use <kernel_dir>/scripts/get_dvb_firmware to get the firmware"
 
@@ -87,7 +87,7 @@ MODULE_PARM_DESC(demod, "demod to probe (1=cx24116 2=stv0903+stv6110 4=stv0903+s
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 static int dw210x_op_rw(struct usb_device *dev, u8 request, u16 value,
-                       u16 index, u8 * data, u16 len, int flags)
+                       u16 index, u8 *data, u16 len, int flags)
 {
        int ret;
        u8 *u8buf;
@@ -103,7 +103,7 @@ static int dw210x_op_rw(struct usb_device *dev, u8 request, u16 value,
        if (flags == DW210X_WRITE_MSG)
                memcpy(u8buf, data, len);
        ret = usb_control_msg(dev, pipe, request, request_type | USB_TYPE_VENDOR,
-                               value, index , u8buf, len, 2000);
+                               value, index, u8buf, len, 2000);
 
        if (flags == DW210X_READ_MSG)
                memcpy(data, u8buf, len);
@@ -322,7 +322,7 @@ static int dw2102_earda_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg ms
                dw210x_op_rw(d->udev, 0xc2, 0, 0,
                                obuf, msg[0].len + 2, DW210X_WRITE_MSG);
                /* second read registers */
-               dw210x_op_rw(d->udev, 0xc3, 0xd1 , 0,
+               dw210x_op_rw(d->udev, 0xc3, 0xd1, 0,
                                ibuf, msg[1].len + 2, DW210X_READ_MSG);
                memcpy(msg[1].buf, ibuf + 2, msg[1].len);
 
@@ -368,13 +368,15 @@ static int dw2102_earda_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg ms
                }
                case(DW2102_RC_QUERY): {
                        u8 ibuf[2];
+
                        dw210x_op_rw(d->udev, 0xb8, 0, 0,
                                        ibuf, 2, DW210X_READ_MSG);
-                       memcpy(msg[0].buf, ibuf , 2);
+                       memcpy(msg[0].buf, ibuf, 2);
                        break;
                }
                case(DW2102_VOLTAGE_CTRL): {
                        u8 obuf[2];
+
                        obuf[0] = 0x30;
                        obuf[1] = msg[0].buf[0];
                        dw210x_op_rw(d->udev, 0xb2, 0, 0,
@@ -406,23 +408,26 @@ static int dw2104_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], i
                switch (msg[j].addr) {
                case(DW2102_RC_QUERY): {
                        u8 ibuf[2];
+
                        dw210x_op_rw(d->udev, 0xb8, 0, 0,
                                        ibuf, 2, DW210X_READ_MSG);
-                       memcpy(msg[j].buf, ibuf , 2);
+                       memcpy(msg[j].buf, ibuf, 2);
                        break;
                }
                case(DW2102_VOLTAGE_CTRL): {
                        u8 obuf[2];
+
                        obuf[0] = 0x30;
                        obuf[1] = msg[j].buf[0];
                        dw210x_op_rw(d->udev, 0xb2, 0, 0,
                                        obuf, 2, DW210X_WRITE_MSG);
                        break;
                }
-               /*case 0x55: cx24116
-               case 0x6a: stv0903
-               case 0x68: ds3000, stv0903
-               case 0x60: ts2020, stv6110, stb6100 */
+               /* case 0x55: cx24116
+                * case 0x6a: stv0903
+                * case 0x68: ds3000, stv0903
+                * case 0x60: ts2020, stv6110, stb6100
+                */
                default: {
                        if (msg[j].flags == I2C_M_RD) {
                                /* read registers */
@@ -447,6 +452,7 @@ static int dw2104_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], i
                                                (msg[j].addr == 0x55))) {
                                /* write firmware */
                                u8 obuf[19];
+
                                obuf[0] = msg[j].addr << 1;
                                obuf[1] = (msg[j].len > 15 ? 17 : msg[j].len);
                                obuf[2] = msg[j].buf[0];
@@ -527,7 +533,7 @@ static int dw3101_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                dw210x_op_rw(d->udev, 0xc2, 0, 0,
                                obuf, msg[0].len + 2, DW210X_WRITE_MSG);
                /* second read registers */
-               dw210x_op_rw(d->udev, 0xc3, 0x19 , 0,
+               dw210x_op_rw(d->udev, 0xc3, 0x19, 0,
                                ibuf, msg[1].len + 2, DW210X_READ_MSG);
                memcpy(msg[1].buf, ibuf + 2, msg[1].len);
 
@@ -555,9 +561,10 @@ static int dw3101_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                }
                case(DW2102_RC_QUERY): {
                        u8 ibuf[2];
+
                        dw210x_op_rw(d->udev, 0xb8, 0, 0,
                                        ibuf, 2, DW210X_READ_MSG);
-                       memcpy(msg[0].buf, ibuf , 2);
+                       memcpy(msg[0].buf, ibuf, 2);
                        break;
                }
                }
@@ -594,6 +601,7 @@ static int s6x0_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                switch (msg[j].addr) {
                case (DW2102_RC_QUERY): {
                        u8 ibuf[5];
+
                        dw210x_op_rw(d->udev, 0xb8, 0, 0,
                                        ibuf, 5, DW210X_READ_MSG);
                        memcpy(msg[j].buf, ibuf + 3, 2);
@@ -621,11 +629,12 @@ static int s6x0_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                                        obuf, 2, DW210X_WRITE_MSG);
                        break;
                }
-               /*case 0x55: cx24116
-               case 0x6a: stv0903
-               case 0x68: ds3000, stv0903, rs2000
-               case 0x60: ts2020, stv6110, stb6100
-               case 0xa0: eeprom */
+               /* case 0x55: cx24116
+                * case 0x6a: stv0903
+                * case 0x68: ds3000, stv0903, rs2000
+                * case 0x60: ts2020, stv6110, stb6100
+                * case 0xa0: eeprom
+                */
                default: {
                        if (msg[j].flags == I2C_M_RD) {
                                /* read registers */
@@ -647,6 +656,7 @@ static int s6x0_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                                                (msg[j].addr == 0x68)) {
                                /* write firmware */
                                u8 obuf[19];
+
                                obuf[0] = (msg[j].len > 16 ?
                                                18 : msg[j].len + 1);
                                obuf[1] = msg[j].addr << 1;
@@ -1009,8 +1019,6 @@ static int su3000_identify_state(struct usb_device *udev,
                                 const struct dvb_usb_device_description **desc,
                                 int *cold)
 {
-       info("%s", __func__);
-
        *cold = 0;
        return 0;
 }
@@ -1366,7 +1374,7 @@ static int stv0288_frontend_attach(struct dvb_usb_adapter *d)
        if (d->fe_adap[0].fe == NULL)
                return -EIO;
 
-       if (NULL == dvb_attach(stb6000_attach, d->fe_adap[0].fe, 0x61, &d->dev->i2c_adap))
+       if (dvb_attach(stb6000_attach, d->fe_adap[0].fe, 0x61, &d->dev->i2c_adap) == NULL)
                return -EIO;
 
        d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage;
@@ -1903,7 +1911,7 @@ static int dw2102_load_firmware(struct usb_device *dev,
                memcpy(p, fw->data, fw->size);
                for (i = 0; i < fw->size; i += 0x40) {
                        b = (u8 *) p + i;
-                       if (dw210x_op_rw(dev, 0xa0, i, 0, b , 0x40,
+                       if (dw210x_op_rw(dev, 0xa0, i, 0, b, 0x40,
                                        DW210X_WRITE_MSG) != 0x40) {
                                err("error while transferring firmware");
                                ret = -EINVAL;
@@ -1950,19 +1958,18 @@ static int dw2102_load_firmware(struct usb_device *dev,
                                dw2102_properties.i2c_algo = &dw2102_i2c_algo;
                                dw2102_properties.adapter->fe[0].tuner_attach = &dw2102_tuner_attach;
                                break;
-                       } else {
-                               /* check STV0288 frontend  */
-                               reset16[0] = 0xd0;
-                               reset16[1] = 1;
-                               reset16[2] = 0;
-                               dw210x_op_rw(dev, 0xc2, 0, 0, &reset16[0], 3,
-                                               DW210X_WRITE_MSG);
-                               dw210x_op_rw(dev, 0xc3, 0xd1, 0, &reset16[0], 3,
-                                               DW210X_READ_MSG);
-                               if (reset16[2] == 0x11) {
-                                       dw2102_properties.i2c_algo = &dw2102_earda_i2c_algo;
-                                       break;
-                               }
+                       }
+                       /* check STV0288 frontend  */
+                       reset16[0] = 0xd0;
+                       reset16[1] = 1;
+                       reset16[2] = 0;
+                       dw210x_op_rw(dev, 0xc2, 0, 0, &reset16[0], 3,
+                                       DW210X_WRITE_MSG);
+                       dw210x_op_rw(dev, 0xc3, 0xd1, 0, &reset16[0], 3,
+                                       DW210X_READ_MSG);
+                       if (reset16[2] == 0x11) {
+                               dw2102_properties.i2c_algo = &dw2102_earda_i2c_algo;
+                               break;
                        }
                        fallthrough;
                case 0x2101:
@@ -2589,15 +2596,15 @@ static int dw2102_probe(struct usb_interface *intf,
                const struct usb_device_id *id)
 {
        if (!(dvb_usb_device_init(intf, &dw2102_properties,
-                                 THIS_MODULE, NULL, adapter_nr) &&
+                                 THIS_MODULE, NULL, adapter_nr) &&
              dvb_usb_device_init(intf, &dw2104_properties,
                                  THIS_MODULE, NULL, adapter_nr) &&
              dvb_usb_device_init(intf, &dw3101_properties,
-                                 THIS_MODULE, NULL, adapter_nr) &&
+                                 THIS_MODULE, NULL, adapter_nr) &&
              dvb_usb_device_init(intf, &s6x0_properties,
-                                 THIS_MODULE, NULL, adapter_nr) &&
+                                 THIS_MODULE, NULL, adapter_nr) &&
              dvb_usb_device_init(intf, &p1100_properties,
-                                 THIS_MODULE, NULL, adapter_nr) &&
+                                 THIS_MODULE, NULL, adapter_nr) &&
              dvb_usb_device_init(intf, &s660_properties,
                                  THIS_MODULE, NULL, adapter_nr) &&
              dvb_usb_device_init(intf, &p7500_properties,