]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
sh-pfc: Guard DT parsing with #ifdef CONFIG_OF
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Wed, 19 Jun 2013 11:26:02 +0000 (13:26 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 24 Jun 2013 09:34:11 +0000 (11:34 +0200)
Fix a compilation error caused by pinconf_generic_parse_dt_config() not
being defined on !CONFIG_OF platforms by guarding the whole DT node
parsing code with #ifdef CONFIG_OF.

Defining a pinconf_generic_parse_dt_config() on !CONFIG_OF would have
been possible as well, but would have resulted in a larger code size on
!CONFIG_OF platforms (such as arch/sh).

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/sh-pfc/pinctrl.c

index 2cf23476adf84ab25aa4b125f32eaca04d37e155..bc8b028bb5d21eab5ce24a9bc19f83ec36309e0d 100644 (file)
@@ -74,6 +74,7 @@ static void sh_pfc_pin_dbg_show(struct pinctrl_dev *pctldev, struct seq_file *s,
        seq_printf(s, "%s", DRV_NAME);
 }
 
+#ifdef CONFIG_OF
 static int sh_pfc_map_add_config(struct pinctrl_map *map,
                                 const char *group_or_pin,
                                 enum pinctrl_map_type type,
@@ -270,14 +271,17 @@ static int sh_pfc_dt_node_to_map(struct pinctrl_dev *pctldev,
 
        return ret;
 }
+#endif /* CONFIG_OF */
 
 static const struct pinctrl_ops sh_pfc_pinctrl_ops = {
        .get_groups_count       = sh_pfc_get_groups_count,
        .get_group_name         = sh_pfc_get_group_name,
        .get_group_pins         = sh_pfc_get_group_pins,
        .pin_dbg_show           = sh_pfc_pin_dbg_show,
+#ifdef CONFIG_OF
        .dt_node_to_map         = sh_pfc_dt_node_to_map,
        .dt_free_map            = sh_pfc_dt_free_map,
+#endif
 };
 
 static int sh_pfc_get_functions_count(struct pinctrl_dev *pctldev)