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

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

pinctrl: stmfx: Use the callback to populate valid_mask 



This makes use of the existing callback to populate the
valid mask instead of iteratively setting it up during
probe.

Cc: Benjamin Gaignard <benjamin.gaignard@st.com>
Cc: Amelie Delaunay <amelie.delaunay@st.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20190819091140.622-1-linus.walleij@linaro.org
parent c9fc5aff

drivers/pinctrl/pinctrl-stmfx.c

+14 −3
Original line number Original line Diff line number Diff line
@@ -585,12 +585,24 @@ static int stmfx_pinctrl_gpio_function_enable(struct stmfx_pinctrl *pctl) 
	return stmfx_function_enable(pctl->stmfx, func);

	return stmfx_function_enable(pctl->stmfx, func);

}

}





static int stmfx_pinctrl_gpio_init_valid_mask(struct gpio_chip *gc,

					      unsigned long *valid_mask,

					      unsigned int ngpios)

{

	struct stmfx_pinctrl *pctl = gpiochip_get_data(gc);

	u32 n;



	for_each_clear_bit(n, &pctl->gpio_valid_mask, ngpios)

		clear_bit(n, valid_mask);



	return 0;

}



static int stmfx_pinctrl_probe(struct platform_device *pdev)

static int stmfx_pinctrl_probe(struct platform_device *pdev)

{

{

	struct stmfx *stmfx = dev_get_drvdata(pdev->dev.parent);

	struct stmfx *stmfx = dev_get_drvdata(pdev->dev.parent);

	struct device_node *np = pdev->dev.of_node;

	struct device_node *np = pdev->dev.of_node;

	struct stmfx_pinctrl *pctl;

	struct stmfx_pinctrl *pctl;

	u32 n;

	int irq, ret;

	int irq, ret;





	pctl = devm_kzalloc(stmfx->dev, sizeof(*pctl), GFP_KERNEL);

	pctl = devm_kzalloc(stmfx->dev, sizeof(*pctl), GFP_KERNEL);
@@ -651,6 +663,7 @@ static int stmfx_pinctrl_probe(struct platform_device *pdev) 
	pctl->gpio_chip.can_sleep = true;

	pctl->gpio_chip.can_sleep = true;

	pctl->gpio_chip.of_node = np;

	pctl->gpio_chip.of_node = np;

	pctl->gpio_chip.need_valid_mask = true;

	pctl->gpio_chip.need_valid_mask = true;

	pctl->gpio_chip.init_valid_mask = stmfx_pinctrl_gpio_init_valid_mask;





	ret = devm_gpiochip_add_data(pctl->dev, &pctl->gpio_chip, pctl);

	ret = devm_gpiochip_add_data(pctl->dev, &pctl->gpio_chip, pctl);

	if (ret) {

	if (ret) {
@@ -668,8 +681,6 @@ static int stmfx_pinctrl_probe(struct platform_device *pdev) 
	pctl->irq_chip.irq_set_type = stmfx_pinctrl_irq_set_type;

	pctl->irq_chip.irq_set_type = stmfx_pinctrl_irq_set_type;

	pctl->irq_chip.irq_bus_lock = stmfx_pinctrl_irq_bus_lock;

	pctl->irq_chip.irq_bus_lock = stmfx_pinctrl_irq_bus_lock;

	pctl->irq_chip.irq_bus_sync_unlock = stmfx_pinctrl_irq_bus_sync_unlock;

	pctl->irq_chip.irq_bus_sync_unlock = stmfx_pinctrl_irq_bus_sync_unlock;

	for_each_clear_bit(n, &pctl->gpio_valid_mask, pctl->gpio_chip.ngpio)

		clear_bit(n, pctl->gpio_chip.valid_mask);





	ret = gpiochip_irqchip_add_nested(&pctl->gpio_chip, &pctl->irq_chip,

	ret = gpiochip_irqchip_add_nested(&pctl->gpio_chip, &pctl->irq_chip,

					  0, handle_bad_irq, IRQ_TYPE_NONE);

					  0, handle_bad_irq, IRQ_TYPE_NONE);