pinctrl: baytrail: Fix types of config value in byt_pin_config_set()

[ Upstream commit 1a856a22e6036c5f0d6da7568b4550270f989038 ]

When unpacked, the config value is split to two of different types.
Fix the types accordingly.

Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/pinctrl/intel/pinctrl-baytrail.c b/drivers/pinctrl/intel/pinctrl-baytrail.c
index ec76e43527c5ccc6f1bedaf7dd38b18e208a3938..95a8a3a22b2b4d9cece0af3758650f3130d6b92a 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-baytrail.c
+++ b/drivers/pinctrl/intel/pinctrl-baytrail.c
@@ -921,13 +921,14 @@ static int byt_pin_config_set(struct pinctrl_dev *pctl_dev,
                              unsigned int num_configs)
 {
        struct intel_pinctrl *vg = pinctrl_dev_get_drvdata(pctl_dev);
-       unsigned int param, arg;
        void __iomem *conf_reg = byt_gpio_reg(vg, offset, BYT_CONF0_REG);
        void __iomem *val_reg = byt_gpio_reg(vg, offset, BYT_VAL_REG);
        void __iomem *db_reg = byt_gpio_reg(vg, offset, BYT_DEBOUNCE_REG);
        u32 conf, val, db_pulse, debounce;
+       enum pin_config_param param;
        unsigned long flags;
        int i, ret = 0;
+       u32 arg;
 
        raw_spin_lock_irqsave(&byt_lock, flags);