From patchwork Fri Aug 16 07:20:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 267559 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8503B2C0200 for ; Fri, 16 Aug 2013 17:21:37 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VAELX-0003hv-4j; Fri, 16 Aug 2013 07:21:19 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VAELO-0002O9-9O; Fri, 16 Aug 2013 07:21:10 +0000 Received: from smtp30.i.mail.ru ([94.100.177.90]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VAELI-0002Lp-95 for linux-mtd@lists.infradead.org; Fri, 16 Aug 2013 07:21:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2; h=Message-Id:Date:Subject:Cc:To:From; bh=i5U0/6CEGwbzIu+hdjmNCoUH3qcm14vJAidxIDC3F5c=; b=XH2mrp0GnNyY7k9xhI8BmrhWQ62uFNGGO2wI2FknHx58wPfuiFWVc+VUAJAuOGpYUPrf4bnZz2PVqOHD5TObKBy0s4dweSEjV3QrDZdps3xcckfhGJGFY8Wx4duJbqD8wa8CFRnhWSHWs57OGE/kkvS61/ph/Y1PFsVrWvYLQqM=; Received: from [217.119.30.118] (port=34955 helo=shc.milas.spb.ru) by smtp30.i.mail.ru with esmtpa (envelope-from ) id 1VAEKt-0002I2-GK; Fri, 16 Aug 2013 11:20:39 +0400 From: Alexander Shiyan To: linux-mtd@lists.infradead.org Subject: [PATCH v4 2/4] mtd: nand: gpio: Use devm_gpio_request_one() where possible Date: Fri, 16 Aug 2013 11:20:32 +0400 Message-Id: <1376637633-12540-1-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 1.8.1.5 X-Spam: Not detected X-Mras: Ok X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130816_032104_707812_E96CAA68 X-CRM114-Status: UNSURE ( 9.18 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.2 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.8 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [217.119.30.118 listed in dnsbl.sorbs.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (shc_work[at]mail.ru) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Artem Bityutskiy , Brian Norris , David Woodhouse , Alexander Shiyan X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Alexander Shiyan --- 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 8eea181..98cc714 100644 --- a/drivers/mtd/nand/gpio.c +++ b/drivers/mtd/nand/gpio.c @@ -190,14 +190,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; }