Commit 1f3dcfe5 authored by Haotian Zhang's avatar Haotian Zhang Committed by Miquel Raynal
Browse files

mtd: rawnand: lpc32xx_slc: Convert to use devm_gpiod_get_optional() 



The initial fix for a GPIO descriptor leak added manual gpiod_put()
calls in the error path and remove function.

This follow-up patch improves upon the fix by switching to the
resource-managed devm_gpiod_get_optional() API.

Suggested-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Signed-off-by: default avatarHaotian Zhang <vulab@iscas.ac.cn>
Reviewed-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 88fd4e4d

drivers/mtd/nand/raw/lpc32xx_slc.c

+1 −3
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) 
	}



	/* Start with WP disabled, if available */

	host->wp_gpio = gpiod_get_optional(&pdev->dev, NULL, GPIOD_OUT_LOW);

	host->wp_gpio = devm_gpiod_get_optional(&pdev->dev, NULL, GPIOD_OUT_LOW);

	res = PTR_ERR_OR_ZERO(host->wp_gpio);

	if (res) {

		if (res != -EPROBE_DEFER)
@@ -937,7 +937,6 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) 
	dma_release_channel(host->dma_chan);

enable_wp:

	lpc32xx_wp_enable(host);

	gpiod_put(host->wp_gpio);



	return res;

}
@@ -963,7 +962,6 @@ static void lpc32xx_nand_remove(struct platform_device *pdev) 
	writel(tmp, SLC_CTRL(host->io_base));



	lpc32xx_wp_enable(host);

	gpiod_put(host->wp_gpio);

}



static int lpc32xx_nand_resume(struct platform_device *pdev)