From patchwork Fri Nov 4 10:43:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 80815 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1079005qge; Fri, 4 Nov 2016 03:42:59 -0700 (PDT) X-Received: by 10.98.150.79 with SMTP id c76mr25435100pfe.154.1478256178934; 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 S934402AbcKDKmi (ORCPT + 27 others); Fri, 4 Nov 2016 06:42:38 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:54876 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934210AbcKDKmf (ORCPT ); Fri, 4 Nov 2016 06:42:35 -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 uA4AebT4028031; Fri, 4 Nov 2016 19:40:53 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com uA4AebT4028031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1478256054; bh=Rrx6AEhw7jwIGXxpmu3qhzVCzBx6nTGB/CX4UQSAq9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LNXR2bBeUwVS5Fkjf8zkMiXHJrV1kFWdZSX8pbGpO/gopjoKxbMBPd72cqX0Zf35j jo+InEhbHhmkSUBmINiNPJZ/R2qMzDETVm0csJWP8PTV9zeKk+GAG5k1XObeE5N7aa 66wMUfgOE5AV+9fhK0VUuU47ZC2phg5l0YhaFvnsdXIoouF3GEG3UWxMYaYh998bBk 7PMGWtluFutOexpRDue1EZpTi0PTfrBiTUHS3AiNoj695Vi1Ot+dd4DEwDcc4dZKaf TnZPtaP8Y4JRnjoOZ1D2UHqSoR7aeW8oDs3Fjyk7pf5uVqcqAo0Fj26YkzWkudKaI7 UdPEeU0mVnSsw== 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 19/22] mtd: nand: hisi504: return error code of nand_scan_ident() on error Date: Fri, 4 Nov 2016 19:43:07 +0900 Message-Id: <1478256190-7452-20-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 The nand_scan_ident() returns an appropriate error value when it fails. Use it instead of the fixed error code -ENODEV. (This driver is already doing so for nand_scan_tail().) Signed-off-by: Masahiro Yamada --- drivers/mtd/nand/hisi504_nand.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 1.9.1 diff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/hisi504_nand.c index 9432546..e40364e 100644 --- a/drivers/mtd/nand/hisi504_nand.c +++ b/drivers/mtd/nand/hisi504_nand.c @@ -774,10 +774,8 @@ static int hisi_nfc_probe(struct platform_device *pdev) } ret = nand_scan_ident(mtd, max_chips, NULL); - if (ret) { - ret = -ENODEV; + if (ret) goto err_res; - } host->buffer = dmam_alloc_coherent(dev, mtd->writesize + mtd->oobsize, &host->dma_buffer, GFP_KERNEL);