Commit edc5601d authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

pinctrl: meson: Replace custom code by gpiochip_node_count() call 



Since we have generic function to count GPIO controller nodes
under a given device, there is no need to open code it. Replace
custom code by gpiochip_node_count() call.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
parent 6671d0bc

drivers/pinctrl/meson/pinctrl-meson.c

+12 −16
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <linux/pinctrl/pinctrl.h>

#include <linux/pinctrl/pinmux.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/regmap.h>

#include <linux/seq_file.h>
@@ -662,27 +663,22 @@ static struct regmap *meson_map_resource(struct meson_pinctrl *pc, 
	return devm_regmap_init_mmio(pc->dev, base, &meson_regmap_config);

}



static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc,

				  struct device_node *node)

static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc)

{

	struct device_node *np, *gpio_np = NULL;

	struct device_node *gpio_np;

	unsigned int chips;



	for_each_child_of_node(node, np) {

		if (!of_find_property(np, "gpio-controller", NULL))

			continue;

		if (gpio_np) {

			dev_err(pc->dev, "multiple gpio nodes\n");

			of_node_put(np);

	chips = gpiochip_node_count(pc->dev);

	if (!chips) {

		dev_err(pc->dev, "no gpio node found\n");

		return -EINVAL;

	}

		gpio_np = np;

	}



	if (!gpio_np) {

		dev_err(pc->dev, "no gpio node found\n");

	if (chips > 1) {

		dev_err(pc->dev, "multiple gpio nodes\n");

		return -EINVAL;

	}



	gpio_np = to_of_node(gpiochip_node_get_first(pc->dev));

	pc->of_node = gpio_np;



	pc->reg_mux = meson_map_resource(pc, gpio_np, "mux");
@@ -751,7 +747,7 @@ int meson_pinctrl_probe(struct platform_device *pdev) 
	pc->dev = dev;

	pc->data = (struct meson_pinctrl_data *) of_device_get_match_data(dev);



	ret = meson_pinctrl_parse_dt(pc, dev->of_node);

	ret = meson_pinctrl_parse_dt(pc);

	if (ret)

		return ret;