Merge git://www.linux-watchdog.org/linux-watchdog

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / devicetree.c

diff --git a/drivers/pinctrl/devicetree.c b/drivers/pinctrl/devicetree.c
index 0bbf7d71b2811242a5a69db9fe97389c1acde5e8..fe04e748dfe4b5cf036af6e9e2af7ba7c0868b19 100644 (file)
--- a/drivers/pinctrl/devicetree.c
+++ b/drivers/pinctrl/devicetree.c
@@ -97,13 +97,7 @@ static int dt_remember_or_free_map(struct pinctrl *p, const char *statename,
 
 struct pinctrl_dev *of_pinctrl_get(struct device_node *np)
 {
-       struct pinctrl_dev *pctldev;
-
-       pctldev = get_pinctrl_dev_from_of_node(np);
-       if (!pctldev)
-               return NULL;
-
-       return pctldev;
+       return get_pinctrl_dev_from_of_node(np);
 }
 
 static int dt_to_map_one_config(struct pinctrl *p, const char *statename,