Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c445cac3 authored by Hongzhou Yang's avatar Hongzhou Yang Committed by Linus Walleij
Browse files

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: default avatarHongzhou Yang <hongzhou.yang@mediatek.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 3221f40b

drivers/pinctrl/mediatek/pinctrl-mtk-common.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -406,7 +406,8 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev, 
		return -EINVAL;

		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)

	if (num_configs)

		has_config = 1;

		has_config = 1;
@@ -1125,7 +1126,7 @@ int mtk_pctrl_init(struct platform_device *pdev, 




	prop = of_find_property(np, "pins-are-numbered", NULL);

	prop = of_find_property(np, "pins-are-numbered", NULL);

	if (!prop) {

	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;

		return -EINVAL;

	}

	}