diff options
| author | Hongzhou Yang <hongzhou.yang@mediatek.com> | 2015-02-11 23:56:11 -0800 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-03-18 02:02:17 +0100 |
| commit | c445cac30781b99621df3a162bff9efcac411e9e (patch) | |
| tree | 377fc8239726ec57152f0792f3b429fa90357509 | |
| parent | 3221f40b7631183b0c7a2e5d4be00cab12d983c3 (diff) | |
| download | lwn-c445cac30781b99621df3a162bff9efcac411e9e.tar.gz lwn-c445cac30781b99621df3a162bff9efcac411e9e.zip | |
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>
| -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, 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; } |