Patch replaces devm_gpio_request() by devm_gpio_request_one() function and adds a helper for set/clear WP signal. This change simplify source code a bit.
Signed-off-by: Alexander Shiyan <[email protected]> --- drivers/mtd/nand/gpio.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c index 8ec731d..a3286c8 100644 --- a/drivers/mtd/nand/gpio.c +++ b/drivers/mtd/nand/gpio.c @@ -189,14 +189,20 @@ gpio_nand_get_io_sync(struct platform_device *pdev) return platform_get_resource(pdev, IORESOURCE_MEM, 1); } +static void gpio_nand_set_wp(struct gpiomtd *gpiomtd, int val) +{ + if (gpio_is_valid(gpiomtd->plat.gpio_nwp)) + gpio_set_value(gpiomtd->plat.gpio_nwp, val); +} + static int gpio_nand_remove(struct platform_device *pdev) { struct gpiomtd *gpiomtd = platform_get_drvdata(pdev); nand_release(&gpiomtd->mtd_info); - if (gpio_is_valid(gpiomtd->plat.gpio_nwp)) - gpio_set_value(gpiomtd->plat.gpio_nwp, 0); + gpio_nand_set_wp(gpiomtd, 0); + gpio_set_value(gpiomtd->plat.gpio_nce, 1); return 0; @@ -242,34 +248,33 @@ static int gpio_nand_probe(struct platform_device *pdev) return PTR_ERR(gpiomtd->io_sync); } - ret = devm_gpio_request(&pdev->dev, gpiomtd->plat.gpio_nce, "NAND NCE"); + ret = devm_gpio_request_one(&pdev->dev, gpiomtd->plat.gpio_nce, + GPIOF_OUT_INIT_HIGH, "NAND NCE"); if (ret) return ret; - gpio_direction_output(gpiomtd->plat.gpio_nce, 1); if (gpio_is_valid(gpiomtd->plat.gpio_nwp)) { - ret = devm_gpio_request(&pdev->dev, gpiomtd->plat.gpio_nwp, - "NAND NWP"); + ret = devm_gpio_request_one(&pdev->dev, gpiomtd->plat.gpio_nwp, + GPIOF_OUT_INIT_LOW, "NAND NWP"); if (ret) return ret; } - ret = devm_gpio_request(&pdev->dev, gpiomtd->plat.gpio_ale, "NAND ALE"); + ret = devm_gpio_request_one(&pdev->dev, gpiomtd->plat.gpio_ale, + GPIOF_OUT_INIT_LOW, "NAND ALE"); if (ret) return ret; - gpio_direction_output(gpiomtd->plat.gpio_ale, 0); - ret = devm_gpio_request(&pdev->dev, gpiomtd->plat.gpio_cle, "NAND CLE"); + ret = devm_gpio_request_one(&pdev->dev, gpiomtd->plat.gpio_cle, + GPIOF_OUT_INIT_LOW, "NAND CLE"); if (ret) return ret; - gpio_direction_output(gpiomtd->plat.gpio_cle, 0); if (gpio_is_valid(gpiomtd->plat.gpio_rdy)) { - ret = devm_gpio_request(&pdev->dev, gpiomtd->plat.gpio_rdy, - "NAND RDY"); + ret = devm_gpio_request_one(&pdev->dev, gpiomtd->plat.gpio_rdy, + GPIOF_IN, "NAND RDY"); if (ret) return ret; - gpio_direction_input(gpiomtd->plat.gpio_rdy); chip->dev_ready = gpio_nand_devready; } @@ -284,8 +289,7 @@ static int gpio_nand_probe(struct platform_device *pdev) platform_set_drvdata(pdev, gpiomtd); - if (gpio_is_valid(gpiomtd->plat.gpio_nwp)) - gpio_direction_output(gpiomtd->plat.gpio_nwp, 1); + gpio_nand_set_wp(gpiomtd, 1); if (nand_scan(&gpiomtd->mtd_info, 1)) { ret = -ENXIO; @@ -304,8 +308,7 @@ static int gpio_nand_probe(struct platform_device *pdev) return 0; err_wp: - if (gpio_is_valid(gpiomtd->plat.gpio_nwp)) - gpio_set_value(gpiomtd->plat.gpio_nwp, 0); + gpio_nand_set_wp(gpiomtd, 0); return ret; } -- 1.8.1.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
