Commit 1d0f9e1e authored Nov 13, 2019 by Geert Uytterhoeven

pinctrl: sh-pfc: Make legacy function GPIO handling less fragile

If there are no function GPIOs, sh_pfc_register_gpiochip() returns early
with a success indicator. This is fragile, as new code may be added
after the #ifdef block, which won't be executed in case of early return.

Invert the logic, so the code always continues until the end of the
function on success.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Link: https://lore.kernel.org/r/20191113101809.28600-1-geert+renesas@glider.be

parent e42617b8

drivers/pinctrl/sh-pfc/gpio.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -386,12 +386,11 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
		}

		/* Register the function GPIOs chip. */
		if (pfc->info->nr_func_gpios == 0)
		return 0;

		if (pfc->info->nr_func_gpios) {
		chip = sh_pfc_add_gpiochip(pfc, gpio_function_setup, NULL);
		if (IS_ERR(chip))
		return PTR_ERR(chip);
		}
		#endif /* CONFIG_PINCTRL_SH_FUNC_GPIO */

		return 0;