Merge tag 'mvebu-arm-5.9-1' of... (0e3a4cb1) · Commits · 戴 / test

Merge tag 'mvebu-arm-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/soc mvebu arm for 5.9 (part 1) Use of for_each_requested_gpio() for gpio driver still in plat-orion for non DT platform. * tag 'mvebu-arm-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu : ARM: orion/gpio: Make use of for_each_requested_gpio() Signed-off-by:

arch/arm/plat-orion/gpio.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -442,6 +442,7 @@ static void orion_gpio_dbg_show(struct seq_file s, struct gpio_chip chip)

		struct orion_gpio_chip *ochip = gpiochip_get_data(chip);
		u32 out, io_conf, blink, in_pol, data_in, cause, edg_msk, lvl_msk;
		const char *label;
		int i;

		out = readl_relaxed(GPIO_OUT(ochip));
		@@ -453,15 +454,10 @@ static void orion_gpio_dbg_show(struct seq_file s, struct gpio_chip chip)
		edg_msk = readl_relaxed(GPIO_EDGE_MASK(ochip));
		lvl_msk = readl_relaxed(GPIO_LEVEL_MASK(ochip));

		for (i = 0; i < chip->ngpio; i++) {
		const char *label;
		for_each_requested_gpio(chip, i, label) {
		u32 msk;
		bool is_out;

		label = gpiochip_is_requested(chip, i);
		if (!label)
		continue;

		msk = 1 << i;
		is_out = !(io_conf & msk);