diff options
author | Hongzhou Yang <hongzhou.yang@mediatek.com> | 2015-02-12 02:56:11 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2015-03-17 21:02:17 -0400 |
commit | c445cac30781b99621df3a162bff9efcac411e9e (patch) | |
tree | 377fc8239726ec57152f0792f3b429fa90357509 /drivers/pinctrl | |
parent | 3221f40b7631183b0c7a2e5d4be00cab12d983c3 (diff) |
pinctrl: mediatek: fix build error
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>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r-- | drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c index a82ae1a6141d..b8f8bef8db1e 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c | |||
@@ -406,7 +406,8 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev, | |||
406 | return -EINVAL; | 406 | return -EINVAL; |
407 | } | 407 | } |
408 | 408 | ||
409 | err = pinconf_generic_parse_dt_config(node, &configs, &num_configs); | 409 | err = pinconf_generic_parse_dt_config(node, pctldev, &configs, |
410 | &num_configs); | ||
410 | if (num_configs) | 411 | if (num_configs) |
411 | has_config = 1; | 412 | has_config = 1; |
412 | 413 | ||
@@ -1125,7 +1126,7 @@ int mtk_pctrl_init(struct platform_device *pdev, | |||
1125 | 1126 | ||
1126 | prop = of_find_property(np, "pins-are-numbered", NULL); | 1127 | prop = of_find_property(np, "pins-are-numbered", NULL); |
1127 | if (!prop) { | 1128 | if (!prop) { |
1128 | dev_err(&pdev->dev, "only support pins-are-numbered format\n", ret); | 1129 | dev_err(&pdev->dev, "only support pins-are-numbered format\n"); |
1129 | return -EINVAL; | 1130 | return -EINVAL; |
1130 | } | 1131 | } |
1131 | 1132 | ||