From patchwork Wed Sep 13 05:20:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 112405 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp535757qgf; Tue, 12 Sep 2017 22:23:46 -0700 (PDT) X-Google-Smtp-Source: ADKCNb5csioo7T8JUmMP6RpoN8ifvtAkblD4MqLHkes+eKmkEXnsyQR0uvILQv4gp9KdmvKdbQZ4 X-Received: by 10.99.3.212 with SMTP id 203mr16665701pgd.270.1505280226422; Tue, 12 Sep 2017 22:23:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505280226; cv=none; d=google.com; s=arc-20160816; b=IU5E5P27ZIDKltCemxdUmbBEFxJMbuT700k4ZPxDg6FH4/Tne2Vxc+/ogleN+VuN7Y rlX0HHhLQh4exNsdKYTmk0/vrjLDsXGgrWqBOcA8UZTETNMhW3YLNaK9eG7OYoJnqD0H rrCCHwOJNUAF/LKX6BZIXHOE/Hx78lZciwovtilnE+F2oOnldFu1CMNKG8TtA/4BS8YH pfu44cVHdVh6TujRurlpku/kGAM7AApNlI3snesfLT/3Drn2qKuqv1a8w+fnFuYLY5Ch P5AmnclsjrxXpwlgQxNiIZVl3Mk6agIRH+e80Gv3t6c8/u0mLmacCuAkcnLnkbcE8Tmc PA2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=jQQQxSecA6Q5ovCRIaC2UvnM2j63/is96LE1R2hVxsM=; b=asKoKL56LE9zuOMEGezgBsE7G/XWEJ5vOkukwh049FLS1KkvCoq/jNQ7PJAas90aN0 Kp2xO08+gOui68QoFKxeyWrP3W4ImxAKIojyfvTakMZykpijDcimhWjcmzUxJXMzWAdN vvGidtOG8dWvKnboigDxbSsAN8zPsQJq92miYtPGyDsm0eEhHfp3mlwvll/hxpWRFqYb dZ3pU6aN4KLEyII0Xk3d+Hg/Cx4L8+GLFRX6Um2WrwS8zDS1GScWDtLLoVbuKuQ01Nu9 bKhgkKFv9e87dvkzobWCHpxfR0kdgjZ2DYz2YJuzhNDu67YrBNgtP6gRADql0Kk1FpGv H82g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=BtBvtVP2; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n13si8633763pgc.270.2017.09.12.22.23.46; Tue, 12 Sep 2017 22:23:46 -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 header.s=dec2015msa header.b=BtBvtVP2; 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 S1751507AbdIMFXE (ORCPT + 26 others); Wed, 13 Sep 2017 01:23:04 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:35929 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751250AbdIMFW4 (ORCPT ); Wed, 13 Sep 2017 01:22:56 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id v8D5Kpx0010397; Wed, 13 Sep 2017 14:20:52 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com v8D5Kpx0010397 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1505280052; bh=jQQQxSecA6Q5ovCRIaC2UvnM2j63/is96LE1R2hVxsM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BtBvtVP2Lti29Jqtozi0yCLSmNc0P/5VSUeNJrjsQwLzB0xJtQhLYxz7anhNUceny H8/6i4hynsRM8MLShc7P1vNefBmCb8+0slPPINBXjfYOxHDuth+2ZbeV0wnAPp45gX fAiegDD1l4vmq1teMpETUCV0fAj2EZSpNRqzrmInsvLh8EmuOx77GTR/KAeXB3/7yk VTdaFyC9y55ExEmM8m9a+6mnGfhj1e1om18884i4ecjuvvo1J+ua/cw8rGj2/s1kDx ta89UZDLsz+orfMUXFxiD2LxJ5aJDEui9RXBpKTuQWObFd5fCFrLqF4xmPjS086XI1 RRvEupA4pQlkg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Masahiro Yamada , Cyrille Pitchen , linux-kernel@vger.kernel.org, Boris Brezillon , Marek Vasut , Brian Norris , Richard Weinberger , David Woodhouse Subject: [PATCH 1/9] mtd: nand: denali: squash setup_ecc_for_xfer() helper into caller Date: Wed, 13 Sep 2017 14:20:38 +0900 Message-Id: <1505280046-16608-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505280046-16608-1-git-send-email-yamada.masahiro@socionext.com> References: <1505280046-16608-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 setup_ecc_for_xfer() is only called from denali_data_xfer(). This helper is small enough, so squash it into the caller. This looks cleaner to me. Signed-off-by: Masahiro Yamada --- drivers/mtd/nand/denali.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) -- 2.7.4 diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index aefdc83..d847ae4 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -208,24 +208,6 @@ static uint32_t denali_check_irq(struct denali_nand_info *denali) return irq_status; } -/* - * This helper function setups the registers for ECC and whether or not - * the spare area will be transferred. - */ -static void setup_ecc_for_xfer(struct denali_nand_info *denali, bool ecc_en, - bool transfer_spare) -{ - int ecc_en_flag, transfer_spare_flag; - - /* set ECC, transfer spare bits if needed */ - ecc_en_flag = ecc_en ? ECC_ENABLE__FLAG : 0; - transfer_spare_flag = transfer_spare ? TRANSFER_SPARE_REG__FLAG : 0; - - /* Enable spare area/ECC per user's request. */ - iowrite32(ecc_en_flag, denali->reg + ECC_ENABLE); - iowrite32(transfer_spare_flag, denali->reg + TRANSFER_SPARE_REG); -} - static void denali_read_buf(struct mtd_info *mtd, uint8_t *buf, int len) { struct denali_nand_info *denali = mtd_to_denali(mtd); @@ -659,7 +641,9 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf, static int denali_data_xfer(struct denali_nand_info *denali, void *buf, size_t size, int page, int raw, int write) { - setup_ecc_for_xfer(denali, !raw, raw); + iowrite32(raw ? 0 : ECC_ENABLE__FLAG, denali->reg + ECC_ENABLE); + iowrite32(raw ? TRANSFER_SPARE_REG__FLAG : 0, + denali->reg + TRANSFER_SPARE_REG); if (denali->dma_avail) return denali_dma_xfer(denali, buf, size, page, raw, write);