Commit e5de9d28 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Bartosz Golaszewski
Browse files

gpio: brcmstb: remove custom 'brcmstb_gpio_set_names' 



Gpiolib core code has been updated to support setting friendly names
through properly 'gpio-line-names'. Instead of redefine behaviour here
to skip the core to be executed, just properly assign the desired offset
per bank to get in the core the expected behaviour.

Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: default avatarGregory Fong <gregory.0xf0@gmail.com>
Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
parent 0fb90391

drivers/gpio/gpio-brcmstb.c

+1 −44
Original line number Diff line number Diff line
@@ -603,49 +603,6 @@ static const struct dev_pm_ops brcmstb_gpio_pm_ops = { 
	.resume_noirq = brcmstb_gpio_resume,

};



static void brcmstb_gpio_set_names(struct device *dev,

				   struct brcmstb_gpio_bank *bank)

{

	struct device_node *np = dev->of_node;

	const char **names;

	int nstrings, base;

	unsigned int i;



	base = bank->id * MAX_GPIO_PER_BANK;



	nstrings = of_property_count_strings(np, "gpio-line-names");

	if (nstrings <= base)

		/* Line names not present */

		return;



	names = devm_kcalloc(dev, MAX_GPIO_PER_BANK, sizeof(*names),

			     GFP_KERNEL);

	if (!names)

		return;



	/*

	 * Make sure to not index beyond the end of the number of descriptors

	 * of the GPIO device.

	 */

	for (i = 0; i < bank->width; i++) {

		const char *name;

		int ret;



		ret = of_property_read_string_index(np, "gpio-line-names",

						    base + i, &name);

		if (ret) {

			if (ret != -ENODATA)

				dev_err(dev, "unable to name line %d: %d\n",

					base + i, ret);

			break;

		}

		if (*name)

			names[i] = name;

	}



	bank->gc.names = names;

}



static int brcmstb_gpio_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -759,6 +716,7 @@ static int brcmstb_gpio_probe(struct platform_device *pdev) 
		gc->of_xlate = brcmstb_gpio_of_xlate;

		/* not all ngpio lines are valid, will use bank width later */

		gc->ngpio = MAX_GPIO_PER_BANK;

		gc->offset = bank->id * MAX_GPIO_PER_BANK;

		if (priv->parent_irq > 0)

			gc->to_irq = brcmstb_gpio_to_irq;
@@ -769,7 +727,6 @@ static int brcmstb_gpio_probe(struct platform_device *pdev) 
		need_wakeup_event |= !!__brcmstb_gpio_get_active_irqs(bank);

		gc->write_reg(reg_base + GIO_MASK(bank->id), 0);



		brcmstb_gpio_set_names(dev, bank);

		err = gpiochip_add_data(gc, bank);

		if (err) {

			dev_err(dev, "Could not add gpiochip for bank %d\n",