From patchwork Wed Sep 13 05:20:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 112404 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp535377qgf; Tue, 12 Sep 2017 22:23:19 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6uWkvXgvogiVSDoeQy6SCGekvWG86zQnmbsPZ20PzJ1pvWJadS92R6H34yRw9VhUDXS3JB X-Received: by 10.98.10.153 with SMTP id 25mr17001835pfk.254.1505280199416; Tue, 12 Sep 2017 22:23:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505280199; cv=none; d=google.com; s=arc-20160816; b=hSIh5EtnFkCj8G9gCPnfmihWjMxZ3yAv/GxGgILJVdl6hMu81gvb7AtaVBjCBNGq6v +0K/lgydWJ2bLTpudfuAizXl0W5iFig3vleWY+PpFXfJhaTO1rUMLH8zphZr8ArlFS0+ vdwQlZ+q5TBJbFLOZhHtoz/gNshpQvGgBiPRjie1n4e4uCbFeSoyf62e3ZF2U0WelzCs R9nfuetyQJBVgNn3Zre1K79xoy+Xcqhf7txmkfJbHWmg/1Xfv5c+a6HmUoX0SPpOhVE6 YKZjLD7AJdLn4S180TAKsB7ObPo6URCPWQYRSgdh5wNjPOlWdcPCv5am7JUyRoyehkPd Z0AQ== 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=7Wo3Jfxi3nNtoxkLx7hG8rEGbq39a8jyMr1IRBQZVTQ=; b=G6teFmEgF30vM7YAlgk+HFO21CpvRwdNWK9vdqmf3XfozSneum9sR+v7t7RprdKXKG 9FppFymAdRao7OwNAh+EanRGTOTnmV30nhEyDoXKnPi8i9iA4DPjpNu9Dr1BxiHAhCNH 2bqqN2+bt/BINeKVYxUhDQhESiHUYOCLKyKRLzEKdzwHdPX23JMx1YabwluRF1urzXhV 077/WQDzmMjXIQAMhMTayyqH310EoFrp/BY+TnHlPeW6lpqkcKkUtz5+oyrOMSf05Fdg pdArQvxsGgMW5hNk+gmXtyOJwzMuWtVRcPrNsP5EyFPr70agfBuo0Ufe2RNQDDg7qBQF J4zQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=z254Um2x; 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 u27si8980760pfa.361.2017.09.12.22.23.19; Tue, 12 Sep 2017 22:23:19 -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=z254Um2x; 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 S1751748AbdIMFXM (ORCPT + 26 others); Wed, 13 Sep 2017 01:23:12 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:36014 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751330AbdIMFW7 (ORCPT ); Wed, 13 Sep 2017 01:22:59 -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 v8D5Kpx6010397; Wed, 13 Sep 2017 14:20:57 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com v8D5Kpx6010397 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1505280057; bh=7Wo3Jfxi3nNtoxkLx7hG8rEGbq39a8jyMr1IRBQZVTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z254Um2xSoMTvxbWPGyX2Vvn3S+9xbc74vwp2Ji1BJBzgignx5efajX4juSzJccOK e5EVPORvrSPw1Ebk/Qa8MSFEeLSHSVEs2GabdY2C5sPQU/1gRFlOYJNseXYdsFfJ/m 62VDYAYfO2+dUNKSRCGK5TMUD2nX8jUiBAr3z97OFEwSaTNUQSQwdzYRpg/le/C0ep KpdNPBenxqJQdFofnXfHg8TyfhQyrh/5Giaon8WxbIBcfQEmRJ7iLK4YpQEcejA3HD Ho6hjU59/RbRxotq8BWL34HmFAuZ/04wsVGaLzUODWcXAGAU7yIG8Wfc69r5BUH13F eYGH6T1gHm91w== 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 7/9] mtd: nand: denali: use more FIELD_PREP / FIELD_GET where appropriate Date: Wed, 13 Sep 2017 14:20:44 +0900 Message-Id: <1505280046-16608-8-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 In several places in this driver, the register fields are retrieved as follows: val = reg & FOO_MASK; Then, modified as follows: reg &= ~FOO_MASK; reg |= val; This code relies on its shift is 0, which we will never know until we check the definition of FOO_MASK. Use FIELD_PREP / FIELD_GET where appropriate. Signed-off-by: Masahiro Yamada --- drivers/mtd/nand/denali.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) -- 2.7.4 diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index 1525c4e..ca98015 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -88,7 +88,7 @@ static void denali_detect_max_banks(struct denali_nand_info *denali) { uint32_t features = ioread32(denali->reg + FEATURES); - denali->max_banks = 1 << (features & FEATURES__N_BANKS); + denali->max_banks = 1 << FIELD_GET(FEATURES__N_BANKS, features); /* the encoding changed from rev 5.0 to 5.1 */ if (denali->revision < 0x0501) @@ -374,7 +374,7 @@ static int denali_hw_ecc_fixup(struct mtd_info *mtd, return 0; } - max_bitflips = ecc_cor & ECC_COR_INFO__MAX_ERRORS; + max_bitflips = FIELD_GET(ECC_COR_INFO__MAX_ERRORS, ecc_cor); /* * The register holds the maximum of per-sector corrected bitflips. @@ -985,7 +985,7 @@ static int denali_setup_data_interface(struct mtd_info *mtd, int chipnr, tmp = ioread32(denali->reg + ACC_CLKS); tmp &= ~ACC_CLKS__VALUE; - tmp |= acc_clks; + tmp |= FIELD_PREP(ACC_CLKS__VALUE, acc_clks); iowrite32(tmp, denali->reg + ACC_CLKS); /* tRWH -> RE_2_WE */ @@ -994,7 +994,7 @@ static int denali_setup_data_interface(struct mtd_info *mtd, int chipnr, tmp = ioread32(denali->reg + RE_2_WE); tmp &= ~RE_2_WE__VALUE; - tmp |= re_2_we; + tmp |= FIELD_PREP(RE_2_WE__VALUE, re_2_we); iowrite32(tmp, denali->reg + RE_2_WE); /* tRHZ -> RE_2_RE */ @@ -1003,7 +1003,7 @@ static int denali_setup_data_interface(struct mtd_info *mtd, int chipnr, tmp = ioread32(denali->reg + RE_2_RE); tmp &= ~RE_2_RE__VALUE; - tmp |= re_2_re; + tmp |= FIELD_PREP(RE_2_RE__VALUE, re_2_re); iowrite32(tmp, denali->reg + RE_2_RE); /* tWHR -> WE_2_RE */ @@ -1012,7 +1012,7 @@ static int denali_setup_data_interface(struct mtd_info *mtd, int chipnr, tmp = ioread32(denali->reg + TWHR2_AND_WE_2_RE); tmp &= ~TWHR2_AND_WE_2_RE__WE_2_RE; - tmp |= we_2_re; + tmp |= FIELD_PREP(TWHR2_AND_WE_2_RE__WE_2_RE, we_2_re); iowrite32(tmp, denali->reg + TWHR2_AND_WE_2_RE); /* tADL -> ADDR_2_DATA */ @@ -1026,8 +1026,8 @@ static int denali_setup_data_interface(struct mtd_info *mtd, int chipnr, addr_2_data = min_t(int, addr_2_data, addr_2_data_mask); tmp = ioread32(denali->reg + TCWAW_AND_ADDR_2_DATA); - tmp &= ~addr_2_data_mask; - tmp |= addr_2_data; + tmp &= ~TCWAW_AND_ADDR_2_DATA__ADDR_2_DATA; + tmp |= FIELD_PREP(TCWAW_AND_ADDR_2_DATA__ADDR_2_DATA, addr_2_data); iowrite32(tmp, denali->reg + TCWAW_AND_ADDR_2_DATA); /* tREH, tWH -> RDWR_EN_HI_CNT */ @@ -1037,7 +1037,7 @@ static int denali_setup_data_interface(struct mtd_info *mtd, int chipnr, tmp = ioread32(denali->reg + RDWR_EN_HI_CNT); tmp &= ~RDWR_EN_HI_CNT__VALUE; - tmp |= rdwr_en_hi; + tmp |= FIELD_PREP(RDWR_EN_HI_CNT__VALUE, rdwr_en_hi); iowrite32(tmp, denali->reg + RDWR_EN_HI_CNT); /* tRP, tWP -> RDWR_EN_LO_CNT */ @@ -1051,7 +1051,7 @@ static int denali_setup_data_interface(struct mtd_info *mtd, int chipnr, tmp = ioread32(denali->reg + RDWR_EN_LO_CNT); tmp &= ~RDWR_EN_LO_CNT__VALUE; - tmp |= rdwr_en_lo; + tmp |= FIELD_PREP(RDWR_EN_LO_CNT__VALUE, rdwr_en_lo); iowrite32(tmp, denali->reg + RDWR_EN_LO_CNT); /* tCS, tCEA -> CS_SETUP_CNT */ @@ -1062,7 +1062,7 @@ static int denali_setup_data_interface(struct mtd_info *mtd, int chipnr, tmp = ioread32(denali->reg + CS_SETUP_CNT); tmp &= ~CS_SETUP_CNT__VALUE; - tmp |= cs_setup; + tmp |= FIELD_PREP(CS_SETUP_CNT__VALUE, cs_setup); iowrite32(tmp, denali->reg + CS_SETUP_CNT); return 0;