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

Commit c9fc5aff authored by Linus Walleij's avatar Linus Walleij
Browse files

gpio: Pass mask and size with the init_valid_mask() 



It is more helpful for drivers to have the affected fields
directly available when we use the callback to set up the
valid mask. Change this and switch over the only user
(MSM) to use the passed parameters. If we do this we can
also move the mask out of publicly visible struct fields.

Cc: Stephen Boyd <swboyd@chromium.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20190819084904.30027-1-linus.walleij@linaro.or


Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f52a0c7b

drivers/gpio/gpiolib.c

+5 −3
Original line number Diff line number Diff line
@@ -375,10 +375,12 @@ static int gpiochip_alloc_valid_mask(struct gpio_chip *gc) 
	return 0;

}



static int gpiochip_init_valid_mask(struct gpio_chip *gpiochip)

static int gpiochip_init_valid_mask(struct gpio_chip *gc)

{

	if (gpiochip->init_valid_mask)

		return gpiochip->init_valid_mask(gpiochip);

	if (gc->init_valid_mask)

		return gc->init_valid_mask(gc,

					   gc->valid_mask,

					   gc->ngpio);



	return 0;

}

drivers/pinctrl/qcom/pinctrl-msm.c

+10 −9
Original line number Diff line number Diff line
@@ -593,24 +593,25 @@ static void msm_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) 
#define msm_gpio_dbg_show NULL

#endif



static int msm_gpio_init_valid_mask(struct gpio_chip *chip)

static int msm_gpio_init_valid_mask(struct gpio_chip *gc,

				    unsigned long *valid_mask,

				    unsigned int ngpios)

{

	struct msm_pinctrl *pctrl = gpiochip_get_data(chip);

	struct msm_pinctrl *pctrl = gpiochip_get_data(gc);

	int ret;

	unsigned int len, i;

	unsigned int max_gpios = pctrl->soc->ngpios;

	const int *reserved = pctrl->soc->reserved_gpios;

	u16 *tmp;



	/* Driver provided reserved list overrides DT and ACPI */

	if (reserved) {

		bitmap_fill(chip->valid_mask, max_gpios);

		bitmap_fill(valid_mask, ngpios);

		for (i = 0; reserved[i] >= 0; i++) {

			if (i >= max_gpios || reserved[i] >= max_gpios) {

			if (i >= ngpios || reserved[i] >= ngpios) {

				dev_err(pctrl->dev, "invalid list of reserved GPIOs\n");

				return -EINVAL;

			}

			clear_bit(reserved[i], chip->valid_mask);

			clear_bit(reserved[i], valid_mask);

		}



		return 0;
@@ -622,7 +623,7 @@ static int msm_gpio_init_valid_mask(struct gpio_chip *chip) 
	if (ret < 0)

		return 0;



	if (ret > max_gpios)

	if (ret > ngpios)

		return -EINVAL;



	tmp = kmalloc_array(len, sizeof(*tmp), GFP_KERNEL);
@@ -635,9 +636,9 @@ static int msm_gpio_init_valid_mask(struct gpio_chip *chip) 
		goto out;

	}



	bitmap_zero(chip->valid_mask, max_gpios);

	bitmap_zero(valid_mask, ngpios);

	for (i = 0; i < len; i++)

		set_bit(tmp[i], chip->valid_mask);

		set_bit(tmp[i], valid_mask);



out:

	kfree(tmp);

include/linux/gpio/driver.h

+3 −1
Original line number Diff line number Diff line
@@ -363,7 +363,9 @@ struct gpio_chip { 
	void			(*dbg_show)(struct seq_file *s,

						struct gpio_chip *chip);



	int			(*init_valid_mask)(struct gpio_chip *chip);

	int			(*init_valid_mask)(struct gpio_chip *chip,

						   unsigned long *valid_mask,

						   unsigned int ngpios);



	int			base;

	u16			ngpio;