gpio: exar: use devm action for freeing the IDA and drop remove() (5300ebb6) · Commits · 戴 / test

drivers/gpio/gpio-exar.c

+12 −15

Original line number	Diff line number	Diff line
		@@ -111,6 +111,13 @@ static int exar_direction_input(struct gpio_chip *chip, unsigned int offset)
		return 0;
		}

		static void exar_devm_ida_free(void *data)
		{
		struct exar_gpio_chip *exar_gpio = data;

		ida_free(&ida_index, exar_gpio->index);
		}

		static const struct regmap_config exar_regmap_config = {
		.name = "exar-gpio",
		.reg_bits = 16,
		@@ -158,6 +165,10 @@ static int gpio_exar_probe(struct platform_device *pdev)
		if (index < 0)
		return index;

		ret = devm_add_action_or_reset(dev, exar_devm_ida_free, exar_gpio);
		if (ret)
		return ret;

		sprintf(exar_gpio->name, "exar_gpio%d", index);
		exar_gpio->gpio_chip.label = exar_gpio->name;
		exar_gpio->gpio_chip.parent = dev;
		@@ -173,29 +184,15 @@ static int gpio_exar_probe(struct platform_device *pdev)

		ret = devm_gpiochip_add_data(dev, &exar_gpio->gpio_chip, exar_gpio);
		if (ret)
		goto err_destroy;

		platform_set_drvdata(pdev, exar_gpio);

		return 0;

		err_destroy:
		ida_free(&ida_index, index);
		return ret;
		}

		static int gpio_exar_remove(struct platform_device *pdev)
		{
		struct exar_gpio_chip *exar_gpio = platform_get_drvdata(pdev);

		ida_free(&ida_index, exar_gpio->index);
		platform_set_drvdata(pdev, exar_gpio);

		return 0;
		}

		static struct platform_driver gpio_exar_driver = {
		.probe = gpio_exar_probe,
		.remove = gpio_exar_remove,
		.driver = {
		.name = DRIVER_NAME,
		},