From patchwork Tue Aug 22 07:09:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 136517 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp3558945vqi; Tue, 22 Aug 2023 04:32:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEChXqeZUwOd+Q5ZsIFxjj2ewIPdiUTCBDN5vPCErlk5xN70mI/E5Gcn1L+JOxnXi3kqZWk X-Received: by 2002:a17:902:e806:b0:1be:f37f:a8d5 with SMTP id u6-20020a170902e80600b001bef37fa8d5mr15226780plg.10.1692703944134; Tue, 22 Aug 2023 04:32:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692703944; cv=none; d=google.com; s=arc-20160816; b=mRQNaJKZUcDAFQDuGWA75+VsJIgD8Sy6Gh8knr6kImq0Q/aFmhGJgD8Tu6keUpJYIw YEd4b+Z+tgLveV1KMVksKdZ56DnyIvctLnOBEaJBgfWEI0PVFR1lzEiSZATDT8Fxycqn HZBaV1ZHZMDlMcpoEfn3BoSqQLfzLE33jRxLD7AjLNirriJcog0JSRs2qruiIBS5VFWQ tQhgESIZB+zSdTgi7KSkOGHPGfdLohE4BuVQTK8MWDGMU9+ToBpDpjLKr8+gAzaEQJW6 LVVFpKmvZvoITK8xcoRYzTdTinK/nF9AyNUJ+AKeSvH8i57ClieMP5YXeozZQ8/mSmQs PbjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=ronaoqlGYGKxZs+Iy0iahqYqJ0qICcq4xMeYgFs72r0=; fh=sGokzmqN/xaL6jGbf+JSrC0JTDwjZ5He1xJ0SScZpXk=; b=IHCml4AzPZ1ShoYC3HLY/SSyPagou+kZb/GJ98HkqtSULCWq8555Qavh2l6f6JyVQC mCrEntUtEHMZFxyVQcmVsDPi+vLgzkQ3Sor8+b8B5g69Bt598DatyY5K9TJu7MYHDFcm GKTRywubHqgJy6d/uA0vhC2u49gJ8Exnao1/km3Hnugtq4Npshx9kLzf9VwoMrNUKtLv fJkJqTyRQ2loh+Rfe+QBl18oty7nyj2DgRil4JklGJ2fIxEW34107b7DNd8JWUTxv4sB u9/9rtgwxsQq5+3sRA0wz7eaLrqgVUybzKegFFeecCNsvVRe8aoJlv4kLDkFXtgVthFa LvCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XcByFBx9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j64-20020a638043000000b0056aef7bb6f0si5829741pgd.41.2023.08.22.04.32.10; Tue, 22 Aug 2023 04:32:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XcByFBx9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233213AbjHVHJx (ORCPT + 99 others); Tue, 22 Aug 2023 03:09:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233190AbjHVHJp (ORCPT ); Tue, 22 Aug 2023 03:09:45 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9611219E for ; Tue, 22 Aug 2023 00:09:43 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2FD6664CC7 for ; Tue, 22 Aug 2023 07:09:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0FF4C433C8; Tue, 22 Aug 2023 07:09:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692688182; bh=yto9V/zcEZBJmLMoKJpHfJ7xX1RdTjUYPmlgcSHSm3Y=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=XcByFBx9BxiDHx0SrX6nTwNSxcYdjeo9UltySMbXGY707cFzznvdcs8Oy8DbPPO5Y TKu005fIxvsutMN902ugXc1x127/6zsfghqtUDov+klcLahpzNrsa+fHGWX9NEO8ao XP/SjtR50QoSeVvNqF1Qnvwo+Lwipledr52NjDR589DgJ+Lfb4FjtuRO3AHUQ13HSL ED6JXjS9jshKbtJunlwRmXVMkYO2iCLFMQ/o3dzRgL9NhMnT79o7vWCzJFH2FyCFnd OlIHgy/nW8kYL7DNgNFuIo/QKfjwZ1PPDMY2qKiU+OgNlu/TRavJHggLCpVeM+INJb n0EMFSP6lF4GQ== From: Michael Walle Date: Tue, 22 Aug 2023 09:09:19 +0200 Subject: [PATCH v2 03/41] mtd: spi-nor: xilinx: use SPI_NOR_ID() in S3AN_INFO() MIME-Version: 1.0 Message-Id: <20230807-mtd-flash-info-db-rework-v2-3-291a0f39f8d8@kernel.org> References: <20230807-mtd-flash-info-db-rework-v2-0-291a0f39f8d8@kernel.org> In-Reply-To: <20230807-mtd-flash-info-db-rework-v2-0-291a0f39f8d8@kernel.org> To: Tudor Ambarus , Pratyush Yadav , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra Cc: linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, Michael Walle X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774928730921995223 X-GMAIL-MSGID: 1774928730921995223 In commit 59273180299a ("mtd: spi-nor: Create macros to define chip IDs and geometries") SPI_NOR_ID() were introduced, but it did only update the INFO() macro in core.h. Also use it in S3AN_INFO(). Signed-off-by: Michael Walle --- drivers/mtd/spi-nor/xilinx.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/mtd/spi-nor/xilinx.c b/drivers/mtd/spi-nor/xilinx.c index 00d53eae5ee8..de5189c38432 100644 --- a/drivers/mtd/spi-nor/xilinx.c +++ b/drivers/mtd/spi-nor/xilinx.c @@ -22,12 +22,7 @@ SPI_MEM_OP_DATA_IN(1, buf, 0)) #define S3AN_INFO(_jedec_id, _n_sectors, _page_size) \ - .id = { \ - ((_jedec_id) >> 16) & 0xff, \ - ((_jedec_id) >> 8) & 0xff, \ - (_jedec_id) & 0xff \ - }, \ - .id_len = 3, \ + SPI_NOR_ID(_jedec_id, 0), \ .sector_size = (8 * (_page_size)), \ .n_sectors = (_n_sectors), \ .page_size = (_page_size), \