1 files changed, 101 insertions, 71 deletions

diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c
index 046223de1e91..2dc1be00b8b8 100644
--- a/drivers/media/usb/em28xx/em28xx-input.c
+++ b/drivers/media/usb/em28xx/em28xx-input.c
@@ -1,25 +1,21 @@
-/*
-  handle em28xx IR remotes via linux kernel input layer.
-
-   Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
-                      Markus Rechberger <mrechberger@gmail.com>
-                      Mauro Carvalho Chehab <mchehab@infradead.org>
-                      Sascha Sommer <saschasommer@freenet.de>
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+// SPDX-License-Identifier: GPL-2.0+
+//
+// handle em28xx IR remotes via linux kernel input layer.
+//
+// Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
+//                    Markus Rechberger <mrechberger@gmail.com>
+//                    Mauro Carvalho Chehab <mchehab@infradead.org>
+//                    Sascha Sommer <saschasommer@freenet.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 
 #include "em28xx.h"
 
@@ -41,15 +37,15 @@ MODULE_PARM_DESC(ir_debug, "enable debug messages [IR]");
 
 #define MODULE_NAME "em28xx"
 
-#define dprintk( fmt, arg...) do {                                      \
+#define dprintk(fmt, arg...) do {                                       \
         if (ir_debug)                                                   \
                 dev_printk(KERN_DEBUG, &ir->dev->intf->dev,             \
                            "input: %s: " fmt, __func__, ## arg);        \
 } while (0)
 
-/**********************************************************
- Polling structure used by em28xx IR's
- **********************************************************/
+/*
+ * Polling structure used by em28xx IR's
+ */
 
 struct em28xx_ir_poll_result {
         unsigned int toggle_bit:1;
@@ -76,24 +72,31 @@ struct em28xx_IR {
 
         int  (*get_key_i2c)(struct i2c_client *ir, enum rc_proto *protocol,
                             u32 *scancode);
-        int  (*get_key)(struct em28xx_IR *, struct em28xx_ir_poll_result *);
+        int  (*get_key)(struct em28xx_IR *ir, struct em28xx_ir_poll_result *r);
 };
 
-/**********************************************************
- I2C IR based get keycodes - should be used with ir-kbd-i2c
- **********************************************************/
+/*
+ * I2C IR based get keycodes - should be used with ir-kbd-i2c
+ */
 
 static int em28xx_get_key_terratec(struct i2c_client *i2c_dev,
                                    enum rc_proto *protocol, u32 *scancode)
 {
+        int rc;
         unsigned char b;
 
         /* poll IR chip */
-        if (1 != i2c_master_recv(i2c_dev, &b, 1))
+        rc = i2c_master_recv(i2c_dev, &b, 1);
+        if (rc != 1) {
+                if (rc < 0)
+                        return rc;
                 return -EIO;
+        }
 
-        /* it seems that 0xFE indicates that a button is still hold
-           down, while 0xff indicates that no button is hold down. */
+        /*
+         * it seems that 0xFE indicates that a button is still hold
+         * down, while 0xff indicates that no button is hold down.
+         */
 
         if (b == 0xff)
                 return 0;
@@ -145,7 +148,7 @@ static int em28xx_get_key_pinnacle_usb_grey(struct i2c_client *i2c_dev,
 
         /* poll IR chip */
 
-        if (3 != i2c_master_recv(i2c_dev, buf, 3))
+        if (i2c_master_recv(i2c_dev, buf, 3) != 3)
                 return -EIO;
 
         if (buf[0] != 0x00)
@@ -162,18 +165,28 @@ static int em28xx_get_key_winfast_usbii_deluxe(struct i2c_client *i2c_dev,
 {
         unsigned char subaddr, keydetect, key;
 
-        struct i2c_msg msg[] = { { .addr = i2c_dev->addr, .flags = 0, .buf = &subaddr, .len = 1},
-                                 { .addr = i2c_dev->addr, .flags = I2C_M_RD, .buf = &keydetect, .len = 1} };
+        struct i2c_msg msg[] = {
+                {
+                        .addr = i2c_dev->addr,
+                        .flags = 0,
+                        .buf = &subaddr, .len = 1
+                }, {
+                        .addr = i2c_dev->addr,
+                        .flags = I2C_M_RD,
+                        .buf = &keydetect,
+                        .len = 1
+                }
+        };
 
         subaddr = 0x10;
-        if (2 != i2c_transfer(i2c_dev->adapter, msg, 2))
+        if (i2c_transfer(i2c_dev->adapter, msg, 2) != 2)
                 return -EIO;
         if (keydetect == 0x00)
                 return 0;
 
         subaddr = 0x00;
         msg[1].buf = &key;
-        if (2 != i2c_transfer(i2c_dev->adapter, msg, 2))
+        if (i2c_transfer(i2c_dev->adapter, msg, 2) != 2)
                 return -EIO;
         if (key == 0x00)
                 return 0;
@@ -183,9 +196,9 @@ static int em28xx_get_key_winfast_usbii_deluxe(struct i2c_client *i2c_dev,
         return 1;
 }
 
-/**********************************************************
- Poll based get keycode functions
- **********************************************************/
+/*
+ * Poll based get keycode functions
+ */
 
 /* This is for the em2860/em2880 */
 static int default_polling_getkey(struct em28xx_IR *ir,
@@ -195,8 +208,9 @@ static int default_polling_getkey(struct em28xx_IR *ir,
         int rc;
         u8 msg[3] = { 0, 0, 0 };
 
-        /* Read key toggle, brand, and key code
-           on registers 0x45, 0x46 and 0x47
+        /*
+         * Read key toggle, brand, and key code
+         * on registers 0x45, 0x46 and 0x47
          */
         rc = dev->em28xx_read_reg_req_len(dev, 0, EM28XX_R45_IR,
                                           msg, sizeof(msg));
@@ -237,8 +251,9 @@ static int em2874_polling_getkey(struct em28xx_IR *ir,
         int rc;
         u8 msg[5] = { 0, 0, 0, 0, 0 };
 
-        /* Read key toggle, brand, and key code
-           on registers 0x51-55
+        /*
+         * Read key toggle, brand, and key code
+         * on registers 0x51-55
          */
         rc = dev->em28xx_read_reg_req_len(dev, 0, EM2874_R51_IR,
                                           msg, sizeof(msg));
@@ -294,9 +309,9 @@ static int em2874_polling_getkey(struct em28xx_IR *ir,
         return 0;
 }
 
-/**********************************************************
- Polling code for em28xx
- **********************************************************/
+/*
+ * Polling code for em28xx
+ */
 
 static int em28xx_i2c_ir_handle_key(struct em28xx_IR *ir)
 {
@@ -347,11 +362,14 @@ static void em28xx_ir_handle_key(struct em28xx_IR *ir)
 
                 if (ir->dev->chip_id == CHIP_ID_EM2874 ||
                     ir->dev->chip_id == CHIP_ID_EM2884)
-                        /* The em2874 clears the readcount field every time the
-                           register is read.  The em2860/2880 datasheet says that it
-                           is supposed to clear the readcount, but it doesn't.  So with
-                           the em2874, we are looking for a non-zero read count as
-                           opposed to a readcount that is incrementing */
+                        /*
+                         * The em2874 clears the readcount field every time the
+                         * register is read.  The em2860/2880 datasheet says
+                         * that it is supposed to clear the readcount, but it
+                         * doesn't. So with the em2874, we are looking for a
+                         * non-zero read count as opposed to a readcount
+                         * that is incrementing
+                         */
                         ir->last_readcount = 0;
                 else
                         ir->last_readcount = poll_result.read_count;
@@ -476,15 +494,18 @@ static int em28xx_ir_change_protocol(struct rc_dev *rc_dev, u64 *rc_proto)
 static int em28xx_probe_i2c_ir(struct em28xx *dev)
 {
         int i = 0;
-        /* Leadtek winfast tv USBII deluxe can find a non working IR-device */
-        /* at address 0x18, so if that address is needed for another board in */
-        /* the future, please put it after 0x1f. */
+        /*
+         * Leadtek winfast tv USBII deluxe can find a non working IR-device
+         * at address 0x18, so if that address is needed for another board in
+         * the future, please put it after 0x1f.
+         */
         const unsigned short addr_list[] = {
                  0x1f, 0x30, 0x47, I2C_CLIENT_END
         };
 
         while (addr_list[i] != I2C_CLIENT_END) {
-                if (i2c_probe_func_quick_read(&dev->i2c_adap[dev->def_i2c_bus], addr_list[i]) == 1)
+                if (i2c_probe_func_quick_read(&dev->i2c_adap[dev->def_i2c_bus],
+                                              addr_list[i]) == 1)
                         return addr_list[i];
                 i++;
         }
@@ -492,9 +513,9 @@ static int em28xx_probe_i2c_ir(struct em28xx *dev)
         return -ENODEV;
 }
 
-/**********************************************************
- Handle buttons
- **********************************************************/
+/*
+ * Handle buttons
+ */
 
 static void em28xx_query_buttons(struct work_struct *work)
 {
@@ -515,7 +536,10 @@ static void em28xx_query_buttons(struct work_struct *work)
                 j = 0;
                 while (dev->board.buttons[j].role >= 0 &&
                        dev->board.buttons[j].role < EM28XX_NUM_BUTTON_ROLES) {
-                        struct em28xx_button *button = &dev->board.buttons[j];
+                        const struct em28xx_button *button;
+
+                        button = &dev->board.buttons[j];
+
                         /* Check if button uses the current address */
                         if (button->reg_r != dev->button_polling_addresses[i]) {
                                 j++;
@@ -618,7 +642,8 @@ static void em28xx_init_buttons(struct em28xx *dev)
         dev->button_polling_interval = EM28XX_BUTTONS_DEBOUNCED_QUERY_INTERVAL;
         while (dev->board.buttons[i].role >= 0 &&
                dev->board.buttons[i].role < EM28XX_NUM_BUTTON_ROLES) {
-                struct em28xx_button *button = &dev->board.buttons[i];
+                const struct em28xx_button *button = &dev->board.buttons[i];
+
                 /* Check if polling address is already on the list */
                 addr_new = true;
                 for (j = 0; j < dev->num_button_polling_addresses; j++) {
@@ -649,6 +674,7 @@ static void em28xx_init_buttons(struct em28xx *dev)
                 /* Add read address to list of polling addresses */
                 if (addr_new) {
                         unsigned int index = dev->num_button_polling_addresses;
+
                         dev->button_polling_addresses[index] = button->reg_r;
                         dev->num_button_polling_addresses++;
                 }
@@ -677,7 +703,7 @@ static void em28xx_shutdown_buttons(struct em28xx *dev)
         /* Clear polling addresses list */
         dev->num_button_polling_addresses = 0;
         /* Deregister input devices */
-        if (dev->sbutton_input_dev != NULL) {
+        if (dev->sbutton_input_dev) {
                 dev_info(&dev->intf->dev, "Deregistering snapshot button\n");
                 input_unregister_device(dev->sbutton_input_dev);
                 dev->sbutton_input_dev = NULL;
@@ -714,7 +740,7 @@ static int em28xx_ir_init(struct em28xx *dev)
                 }
         }
 
-        if (dev->board.ir_codes == NULL && !dev->board.has_ir_i2c) {
+        if (!dev->board.ir_codes && !dev->board.has_ir_i2c) {
                 /* No remote control support */
                 dev_warn(&dev->intf->dev,
                          "Remote control support is not available for this card.\n");
@@ -764,7 +790,7 @@ static int em28xx_ir_init(struct em28xx *dev)
                         goto error;
                 }
 
-                ir->i2c_client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
+                ir->i2c_client = kzalloc(sizeof(*ir->i2c_client), GFP_KERNEL);
                 if (!ir->i2c_client)
                         goto error;
                 ir->i2c_client->adapter = &ir->dev->i2c_adap[dev->def_i2c_bus];
@@ -881,9 +907,11 @@ static int em28xx_ir_suspend(struct em28xx *dev)
         if (ir)
                 cancel_delayed_work_sync(&ir->work);
         cancel_delayed_work_sync(&dev->buttons_query_work);
-        /* is canceling delayed work sufficient or does the rc event
-           kthread needs stopping? kthread is stopped in
-           ir_raw_event_unregister() */
+        /*
+         * is canceling delayed work sufficient or does the rc event
+         * kthread needs stopping? kthread is stopped in
+         * ir_raw_event_unregister()
+         */
         return 0;
 }
 
@@ -895,8 +923,10 @@ static int em28xx_ir_resume(struct em28xx *dev)
                 return 0;
 
         dev_info(&dev->intf->dev, "Resuming input extension\n");
-        /* if suspend calls ir_raw_event_unregister(), the should call
-           ir_raw_event_register() */
+        /*
+         * if suspend calls ir_raw_event_unregister(), the should call
+         * ir_raw_event_register()
+         */
         if (ir)
                 schedule_delayed_work(&ir->work, msecs_to_jiffies(ir->polling));
         if (dev->num_button_polling_addresses)
@@ -924,7 +954,7 @@ static void __exit em28xx_rc_unregister(void)
         em28xx_unregister_extension(&rc_ops);
 }
 
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Mauro Carvalho Chehab");
 MODULE_DESCRIPTION(DRIVER_DESC " - input interface");
 MODULE_VERSION(EM28XX_VERSION);