pinctrl: mediatek: fix build error
authorHongzhou Yang <hongzhou.yang@mediatek.com>
Thu, 12 Feb 2015 07:56:11 +0000 (23:56 -0800)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 18 Mar 2015 01:02:17 +0000 (02:02 +0100)
Due to pinconf_generic_parse_dt_config() API changes in pinctrl
devel branch, add one parameter to fix build error.

Also fix warning:
drivers/pinctrl/mediatek/pinctrl-mtk-common.c:718:3: warning:
too many arguments for format [-Wformat-extra-args]
      dev_err(&pdev->dev, "only support pins-are-numbered format\n", ret);
      ^

by removing extra parameter when calling dev_err in mtk_pctrl_init.

Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/mediatek/pinctrl-mtk-common.c

index a82ae1a..b8f8bef 100644 (file)
@@ -406,7 +406,8 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
                return -EINVAL;
        }
 
-       err = pinconf_generic_parse_dt_config(node, &configs, &num_configs);
+       err = pinconf_generic_parse_dt_config(node, pctldev, &configs,
+               &num_configs);
        if (num_configs)
                has_config = 1;
 
@@ -1125,7 +1126,7 @@ int mtk_pctrl_init(struct platform_device *pdev,
 
        prop = of_find_property(np, "pins-are-numbered", NULL);
        if (!prop) {
-               dev_err(&pdev->dev, "only support pins-are-numbered format\n", ret);
+               dev_err(&pdev->dev, "only support pins-are-numbered format\n");
                return -EINVAL;
        }