Commit a630d396 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Bartosz Golaszewski
Browse files

gpio: regmap: Move optional assignments down in the code 



Move optional assignments down in the code, so they may use some values
from the (updated) struct gpio_chip later on.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarMichael Walle <mwalle@kernel.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Tested-by: default avatarMathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Reviewed-by: default avatarMathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Link: https://lore.kernel.org/r/20250213195621.3133406-5-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 97673ea3

drivers/gpio/gpio-regmap.c

+14 −14
Original line number Diff line number Diff line
@@ -239,20 +239,6 @@ struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config 
	gpio->reg_dir_in_base = config->reg_dir_in_base;

	gpio->reg_dir_out_base = config->reg_dir_out_base;



	/* if not set, assume there is only one register */

	gpio->ngpio_per_reg = config->ngpio_per_reg;

	if (!gpio->ngpio_per_reg)

		gpio->ngpio_per_reg = config->ngpio;



	/* if not set, assume they are consecutive */

	gpio->reg_stride = config->reg_stride;

	if (!gpio->reg_stride)

		gpio->reg_stride = 1;



	gpio->reg_mask_xlate = config->reg_mask_xlate;

	if (!gpio->reg_mask_xlate)

		gpio->reg_mask_xlate = gpio_regmap_simple_xlate;



	chip = &gpio->gpio_chip;

	chip->parent = config->parent;

	chip->fwnode = config->fwnode;
@@ -276,6 +262,20 @@ struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config 
		chip->direction_output = gpio_regmap_direction_output;

	}



	/* if not set, assume there is only one register */

	gpio->ngpio_per_reg = config->ngpio_per_reg;

	if (!gpio->ngpio_per_reg)

		gpio->ngpio_per_reg = config->ngpio;



	/* if not set, assume they are consecutive */

	gpio->reg_stride = config->reg_stride;

	if (!gpio->reg_stride)

		gpio->reg_stride = 1;



	gpio->reg_mask_xlate = config->reg_mask_xlate;

	if (!gpio->reg_mask_xlate)

		gpio->reg_mask_xlate = gpio_regmap_simple_xlate;



	ret = gpiochip_add_data(chip, gpio);

	if (ret < 0)

		goto err_free_gpio;