From patchwork Fri Nov 4 10:43:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 80814 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1079004qge; Fri, 4 Nov 2016 03:42:58 -0700 (PDT) X-Received: by 10.99.139.199 with SMTP id j190mr21158212pge.115.1478256178600; Fri, 04 Nov 2016 03:42:58 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xr4si13071925pab.68.2016.11.04.03.42.58; Fri, 04 Nov 2016 03:42:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934367AbcKDKmd (ORCPT + 27 others); Fri, 4 Nov 2016 06:42:33 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:54628 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934210AbcKDKm1 (ORCPT ); Fri, 4 Nov 2016 06:42:27 -0400 Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id uA4AebT7028031; Fri, 4 Nov 2016 19:40:55 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com uA4AebT7028031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1478256056; bh=oailq1yocTai8xI0pnD6jgL2wNUsvwwaNH2hV8IgAHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cfxsBsupgISYH8RmLGXfU2SgUiUEzdKASknPsasSuWTW1RzGGz7FKwoti6UG0Cecs wApgOxtCUNNyQCWon6F+//59EDiVMJM38Rj/pqT82HkqOZ4HWnktmrromzZ375alBk SjwKLPWoQpXeeyiyxv1LE/t6bpoQs2eDNQDecpyJ3OepeNtAbT0YKO0dm/ZyriqnHy QteXXv0Xni0kmdHNCx4FwA5LNzyLMj8vhVyY/IFYvX06xV9Xuw5auhk5OxMx6VKXP6 j9Y9/C1bFaWILI6yOQJXp24C+aNVgfWuZ1Uacis4NlciApjejU65puGAUsRYOSfmg3 8931QgmUEnyvw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org, Boris Brezillon , Brian Norris , Richard Weinberger , David Woodhouse Subject: [PATCH 22/22] mtd: nand: socrates: use nand_scan() for nand_scan_ident/tail() combo Date: Fri, 4 Nov 2016 19:43:10 +0900 Message-Id: <1478256190-7452-23-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1478256190-7452-1-git-send-email-yamada.masahiro@socionext.com> References: <1478256190-7452-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For this driver, there is nothing between nand_scan_ident() and nand_scan_tail(). They can be merged into nand_scan(). Also, nand_scan() returns an appropriate error value when it fails. Use it instead of the fixed error code -ENXIO. Signed-off-by: Masahiro Yamada --- drivers/mtd/nand/socrates_nand.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) -- 1.9.1 diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c index 888fd31..72369bd 100644 --- a/drivers/mtd/nand/socrates_nand.c +++ b/drivers/mtd/nand/socrates_nand.c @@ -187,17 +187,9 @@ static int socrates_nand_probe(struct platform_device *ofdev) dev_set_drvdata(&ofdev->dev, host); - /* first scan to find the device and get the page size */ - if (nand_scan_ident(mtd, 1, NULL)) { - res = -ENXIO; + res = nand_scan(mtd, 1); + if (res) goto out; - } - - /* second phase scan */ - if (nand_scan_tail(mtd)) { - res = -ENXIO; - goto out; - } res = mtd_device_register(mtd, NULL, 0); if (!res)