Commit 81b01099 authored by Andrew Davis's avatar Andrew Davis Committed by Bartosz Golaszewski
Browse files

gpio: tps65086: Use devm_gpiochip_add_data() to simplify remove path 



Use devm version of gpiochip add function to handle removal for us.

While here update copyright and module author.

Signed-off-by: default avatarAndrew Davis <afd@ti.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent fbc8ab2c

drivers/gpio/gpio-tps65086.c

+4 −23
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/

 *	Andrew F. Davis <afd@ti.com>

 * Copyright (C) 2015-2023 Texas Instruments Incorporated - https://www.ti.com/

 *	Andrew Davis <afd@ti.com>

 *

 * Based on the TPS65912 driver

 */
@@ -80,34 +80,16 @@ static const struct gpio_chip template_chip = { 
static int tps65086_gpio_probe(struct platform_device *pdev)

{

	struct tps65086_gpio *gpio;

	int ret;



	gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);

	if (!gpio)

		return -ENOMEM;



	platform_set_drvdata(pdev, gpio);



	gpio->tps = dev_get_drvdata(pdev->dev.parent);

	gpio->chip = template_chip;

	gpio->chip.parent = gpio->tps->dev;



	ret = gpiochip_add_data(&gpio->chip, gpio);

	if (ret < 0) {

		dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);

		return ret;

	}



	return 0;

}



static int tps65086_gpio_remove(struct platform_device *pdev)

{

	struct tps65086_gpio *gpio = platform_get_drvdata(pdev);



	gpiochip_remove(&gpio->chip);



	return 0;

	return devm_gpiochip_add_data(&pdev->dev, &gpio->chip, gpio);

}



static const struct platform_device_id tps65086_gpio_id_table[] = {
@@ -121,11 +103,10 @@ static struct platform_driver tps65086_gpio_driver = { 
		.name = "tps65086-gpio",

	},

	.probe = tps65086_gpio_probe,

	.remove = tps65086_gpio_remove,

	.id_table = tps65086_gpio_id_table,

};

module_platform_driver(tps65086_gpio_driver);



MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");

MODULE_AUTHOR("Andrew Davis <afd@ti.com>");

MODULE_DESCRIPTION("TPS65086 GPIO driver");

MODULE_LICENSE("GPL v2");