From patchwork Fri Sep 22 03:46: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: 113954 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp2798505qgf; Thu, 21 Sep 2017 20:49:54 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBEanI/G/CBONjj0gkoYUh2Q9bromvCp8JZqyHbjbyJ/FRY5DkgM35OhrCf5V/PTZooqSbS X-Received: by 10.99.186.12 with SMTP id k12mr7778185pgf.276.1506052194768; Thu, 21 Sep 2017 20:49:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506052194; cv=none; d=google.com; s=arc-20160816; b=0ftua5qluQyph/5Po8+7Pqa1eIpR///Zmv1GacztJlbFLeuGVKES3OoSp+cZhUE47i l/qwUi6ip/x26jCzT+1DwNjrIfSycveRBgLQbzkOecQ6rDsbfgVY6uiO6SqTpAZrYrr5 HXVD8OGoRvWifj/HYHFa+9H6YyaTVftUAmXtjZ1vldCLHhI2rs2u0+u90PNWigLzW5+K BpQMGZk0med3vmAPLbjszdK+eFaw6q6ec6YaTfgtij+QlNPvzxkVoxGqLhi6//QYNauJ 6Nfr8SHHuKdw8y0912uRg0iGGun7pOZ9kEy/V+bYmChCNU/Bqq+95nbGzmkWGN4eAtWM 0lcg== 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=59fdI7+UE95X4PNnOZNZNKCOmyNFFdGozGYIY/JOjgk=; b=vkyemHDHsG/31/GvigHZF0x3QjmGOX5fymJtiiYfDj+7seIemWVCRRHbyDbigSwUFr +AtRedffY0itNEp6aJh9ed11oQU2QVzGYwWLpv+cH8yk9tm3uUtbjId7nvnTqaXC4boU SENHUyEVlZpGmm38NQA4CB9s4IlrMxDkHVPBA7eYi6JO+s7L6+oHXxQP3a8Uxax+E26p T1477ngkKkzpA8GUhEiaTQu/soH1T83hL2+BjQAOIfqcyEwPv0rYqsEnsHNuW9S9lp3a MCCFIgq8TUcKCCgnVzIoDCrURHTMTpybAoQR39y9xh44TRU7QzAe5lHzyPnHzNIArHjb eAKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=mHNUJFbL; 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 l7si2171110pgf.102.2017.09.21.20.49.54; Thu, 21 Sep 2017 20:49:54 -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=mHNUJFbL; 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 S1751968AbdIVDt1 (ORCPT + 26 others); Thu, 21 Sep 2017 23:49:27 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:59726 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751891AbdIVDtB (ORCPT ); Thu, 21 Sep 2017 23:49:01 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id v8M3kwAK029389; Fri, 22 Sep 2017 12:47:00 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v8M3kwAK029389 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1506052020; bh=59fdI7+UE95X4PNnOZNZNKCOmyNFFdGozGYIY/JOjgk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mHNUJFbLTCeNJmhfWV+NIhXLq0bLHEQLrfbnz1Vq9HIBy39LVZ4qciab+O216YcN3 ua99UCqzcZdFRV0xFDqH1B4/xoVQb+seWyiQV+aYBMX0PtzQVBi0HXhAEL+Tc7IMSZ 8wpqmXNTiT2/8ngbRKjAJp5wKvVAfoQ21JqGZ6MFB0NqH2nEOhGu2k/45HT8xqoGWe 7aUBk5wpTjUeANhyuAUegML1G4dZUq/lH7DKAYYPC8LUfzj64QNuR+Km3P/IYgWNDr ph1umNSdRTux7m1IsaZWd5ncL4mHJGRBW3aWCeMIyZS1jm2IzXXxjw/5P+m5ejYPOu povlGe4du4s9g== 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 v2 01/12] mtd: nand: denali: squash setup_ecc_for_xfer() helper into caller Date: Fri, 22 Sep 2017 12:46:38 +0900 Message-Id: <1506052009-8285-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506052009-8285-1-git-send-email-yamada.masahiro@socionext.com> References: <1506052009-8285-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 --- Changes in v2: None 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);