Merge tag 'v4.4-rc5' into devel

Linux 4.4-rc5

4 files changed, 13 insertions, 16 deletions

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 2b80a796d966..99a4c10ed43f 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -5,8 +5,6 @@
 config PINCTRL
         bool
 
-if PINCTRL
-
 menu "Pin controllers"
         depends on PINCTRL
 
@@ -275,5 +273,3 @@ config PINCTRL_TB10X
         select GPIOLIB
 
 endmenu
-
-endif
diff --git a/drivers/pinctrl/freescale/pinctrl-imx1-core.c b/drivers/pinctrl/freescale/pinctrl-imx1-core.c
index 88a7fac11bd4..acaf84cadca3 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx1-core.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx1-core.c
@@ -538,8 +538,10 @@ static int imx1_pinctrl_parse_functions(struct device_node *np,
                 func->groups[i] = child->name;
                 grp = &info->groups[grp_index++];
                 ret = imx1_pinctrl_parse_groups(child, grp, info, i++);
-                if (ret == -ENOMEM)
+                if (ret == -ENOMEM) {
+                        of_node_put(child);
                         return ret;
+                }
         }
 
         return 0;
@@ -582,8 +584,10 @@ static int imx1_pinctrl_parse_dt(struct platform_device *pdev,
 
         for_each_child_of_node(np, child) {
                 ret = imx1_pinctrl_parse_functions(child, info, ifunc++);
-                if (ret == -ENOMEM)
+                if (ret == -ENOMEM) {
+                        of_node_put(child);
                         return -ENOMEM;
+                }
         }
 
         return 0;
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 3bb4a2ae8ee4..8db7cdfbfbc6 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -754,7 +754,7 @@ static int mtk_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
         reg_addr =  mtk_get_port(pctl, offset) + pctl->devdata->dir_offset;
         bit = BIT(offset & 0xf);
         regmap_read(pctl->regmap1, reg_addr, &read_val);
-        return !!(read_val & bit);
+        return !(read_val & bit);
 }
 
 static int mtk_gpio_get(struct gpio_chip *chip, unsigned offset)
@@ -764,12 +764,8 @@ static int mtk_gpio_get(struct gpio_chip *chip, unsigned offset)
         unsigned int read_val = 0;
         struct mtk_pinctrl *pctl = dev_get_drvdata(chip->dev);
 
-        if (mtk_gpio_get_direction(chip, offset))
-                reg_addr = mtk_get_port(pctl, offset) +
-                        pctl->devdata->dout_offset;
-        else
-                reg_addr = mtk_get_port(pctl, offset) +
-                        pctl->devdata->din_offset;
+        reg_addr = mtk_get_port(pctl, offset) +
+                pctl->devdata->din_offset;
 
         bit = BIT(offset & 0xf);
         regmap_read(pctl->regmap1, reg_addr, &read_val);
@@ -1004,6 +1000,7 @@ static struct gpio_chip mtk_gpio_chip = {
         .owner                  = THIS_MODULE,
         .request                = gpiochip_generic_request,
         .free                   = gpiochip_generic_free,
+        .get_direction          = mtk_gpio_get_direction,
         .direction_input        = mtk_gpio_direction_input,
         .direction_output       = mtk_gpio_direction_output,
         .get                    = mtk_gpio_get,
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7734.c b/drivers/pinctrl/sh-pfc/pfc-sh7734.c
index 20373a9c1710..b0b328b3130b 100644
--- a/drivers/pinctrl/sh-pfc/pfc-sh7734.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh7734.c
@@ -23,11 +23,11 @@
         PORT_GP_12(5, fn, sfx)
 
 #undef _GP_DATA
-#define _GP_DATA(bank, pin, name, sfx)                                  \
+#define _GP_DATA(bank, pin, name, sfx, cfg)                             \
         PINMUX_DATA(name##_DATA, name##_FN, name##_IN, name##_OUT)
 
-#define _GP_INOUTSEL(bank, pin, name, sfx)      name##_IN, name##_OUT
-#define _GP_INDT(bank, pin, name, sfx)          name##_DATA
+#define _GP_INOUTSEL(bank, pin, name, sfx, cfg) name##_IN, name##_OUT
+#define _GP_INDT(bank, pin, name, sfx, cfg)     name##_DATA
 #define GP_INOUTSEL(bank)       PORT_GP_32_REV(bank, _GP_INOUTSEL, unused)
 #define GP_INDT(bank)           PORT_GP_32_REV(bank, _GP_INDT, unused)