gpio: pca953x: enfore type for i2c_smbus_write_word_data()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 31 May 2016 19:03:43 +0000 (22:03 +0300)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 8 Jun 2016 08:02:24 +0000 (10:02 +0200)
The commit 9b8e3ec34318 ("gpio: pca953x: Use correct u16 value for register
word write") fixed regression in pca953x_write_regs(). At the same time the
solution introduced a sparse warning:

drivers/gpio/gpio-pca953x.c:168:39: warning: incorrect type in argument 3 (different base types)
drivers/gpio/gpio-pca953x.c:168:39:    expected unsigned short [unsigned] [usertype] value
drivers/gpio/gpio-pca953x.c:168:39:    got restricted __le16 [usertype] <noident>

Fix the code by enforcing the type of i2c_smbus_write_word_data() parameter.

Cc: Yong Li <sdliyong@gmail.com>
Cc: Phil Reid <preid@electromag.com.au>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-pca953x.c

index d8233bed4234b49a0d738c09bdcd81dc00b48feb..21b21cd1773b1e6194141083d31b9d6cc3479335 100644 (file)
@@ -163,10 +163,13 @@ static int pca953x_write_regs(struct pca953x_chip *chip, int reg, u8 *val)
                                        NBANK(chip), val);
        } else {
                switch (chip->chip_type) {
-               case PCA953X_TYPE:
-                       ret = i2c_smbus_write_word_data(chip->client,
-                           reg << 1, cpu_to_le16(get_unaligned((u16 *)val)));
+               case PCA953X_TYPE: {
+                       __le16 word = cpu_to_le16(get_unaligned((u16 *)val));
+
+                       ret = i2c_smbus_write_word_data(chip->client, reg << 1,
+                                                       (__force u16)word);
                        break;
+               }
                case PCA957X_TYPE:
                        ret = i2c_smbus_write_byte_data(chip->client, reg << 1,
                                                        val[0]);