gpio: crystalcove: Use devm_gpiochip_add_data() for gpio registration (828e47e4) · Commits · 戴 / test

drivers/gpio/gpio-crystalcove.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -345,7 +345,7 @@ static int crystalcove_gpio_probe(struct platform_device *pdev)
		cg->chip.dbg_show = crystalcove_gpio_dbg_show;
		cg->regmap = pmic->regmap;

		retval = gpiochip_add_data(&cg->chip, cg);
		retval = devm_gpiochip_add_data(&pdev->dev, &cg->chip, cg);
		if (retval) {
		dev_warn(&pdev->dev, "add gpio chip error: %d\n", retval);
		return retval;
		@@ -359,14 +359,10 @@ static int crystalcove_gpio_probe(struct platform_device *pdev)

		if (retval) {
		dev_warn(&pdev->dev, "request irq failed: %d\n", retval);
		goto out_remove_gpio;
		return retval;
		}

		return 0;

		out_remove_gpio:
		gpiochip_remove(&cg->chip);
		return retval;
		}

		static int crystalcove_gpio_remove(struct platform_device *pdev)
		@@ -374,7 +370,6 @@ static int crystalcove_gpio_remove(struct platform_device *pdev)
		struct crystalcove_gpio *cg = platform_get_drvdata(pdev);
		int irq = platform_get_irq(pdev, 0);

		gpiochip_remove(&cg->chip);
		if (irq >= 0)
		free_irq(irq, cg);
		return 0;