Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp1661105pxb; Wed, 2 Feb 2022 09:39:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJzgPL9l4KPdvn8f68yOv6XmczJqQ2HgIK/Zt6TNaeI+dihEpg4rCGQqQQSWtzM2W0NRqrjO X-Received: by 2002:a17:90a:bb01:: with SMTP id u1mr9202808pjr.148.1643823554683; Wed, 02 Feb 2022 09:39:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643823554; cv=none; d=google.com; s=arc-20160816; b=DAsNG6V7UQFi76EVZkBsVsnEI4QVAEQ6HzNrhphJBUchveKMG584SHHMspv+4GbWQz S1o4O+KIwWRLjBmhP/Abe8yURZK3OoNDIDXo8j2JU9Rc7zq4qPSaQ2tpuvOHwchCOWeI F8RsN69Y+gVFVdj52U6Yoc8IMQ4/WoUmCD6iAeGq1zje4DiEF2Q535KtA5r8aztjm7e9 5Wos0TevQpkas5mS1FACxtFg1IedMYjvoUxGX75NcxvSYEftSBofCWFeysKc3NQYUCyc Ztz3Fx7mqtdnWqWf6yGgK6Kuz6Vvk7HUaWA0c+5C9LoOvtt2UsKIis5NCGGNyIQJyWd1 iC0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yIv4VTb5VdcS3L6sdsDDVGx9xtU3Q9aCaHFNOFlKMl4=; b=HdWmA57oQmt5z5ZQIF3J6pmKOE4MQsRwaHY2bBnHWQDQ0a54T1Iehqm9rx9E24lD4w SjznWDAne2qV0ol3D94gzMWqdCTLFayi/6J/ZxszcRsNCMpgA5f9wIDw0X1dmKLbliIB 2HtJjHAsROskSlDmoylnR2K7CU0DlPfNcvTBFCV0mj7UIa3CpdvEnoqwzhJ4kaxdb4fd 6AA+NanY8rhzQ1JgcGBubYlCSUSrywjldkOzKtm+hI+YcUPC/+FomTkuWqW1gUVBclb+ T6+uJ9J3sU2THidaAMq0uPUjZQ5H0y7qHLgJu4bTApdrUXhIWnHt54SvAyNybsPACOdv 2l9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@walle.cc header.s=mail2016061301 header.b=IzDaFxdX; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ob7si6655175pjb.185.2022.02.02.09.39.01; Wed, 02 Feb 2022 09:39:14 -0800 (PST) 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=@walle.cc header.s=mail2016061301 header.b=IzDaFxdX; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231985AbiBBO7r (ORCPT + 99 others); Wed, 2 Feb 2022 09:59:47 -0500 Received: from ssl.serverraum.org ([176.9.125.105]:39231 "EHLO ssl.serverraum.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345293AbiBBO7H (ORCPT ); Wed, 2 Feb 2022 09:59:07 -0500 Received: from mwalle01.kontron.local. (unknown [213.135.10.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ssl.serverraum.org (Postfix) with ESMTPSA id 1AFE722453; Wed, 2 Feb 2022 15:59:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2016061301; t=1643813946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yIv4VTb5VdcS3L6sdsDDVGx9xtU3Q9aCaHFNOFlKMl4=; b=IzDaFxdXy13k7GZxY4ID+OVShStO3QiiP1gNKzG19NZ4M2AmoAmC1yqNGRO13n5OUT+QiD bvXimhKt540pTmk5ziVXRNqHvS0egaaeerKftJ4BQbsJa8qd89kSQTlC4lkT4JNJmYQGEs J+QBcy//hW2N8kNR9LehmQAdkbSceR4= From: Michael Walle To: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Tudor Ambarus , Pratyush Yadav , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Michael Walle Subject: [PATCH v1 14/14] mtd: spi-nor: renumber flags Date: Wed, 2 Feb 2022 15:58:53 +0100 Message-Id: <20220202145853.4187726-15-michael@walle.cc> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220202145853.4187726-1-michael@walle.cc> References: <20220202145853.4187726-1-michael@walle.cc> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As we have deleted some flag, lets renumber them so there are no holes. Signed-off-by: Michael Walle --- drivers/mtd/spi-nor/core.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h index 2130a96e2044..b7fd760e3b47 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h @@ -12,20 +12,20 @@ #define SPI_NOR_MAX_ID_LEN 6 enum spi_nor_option_flags { - SNOR_F_HAS_SR_TB = BIT(1), - SNOR_F_NO_OP_CHIP_ERASE = BIT(2), - SNOR_F_BROKEN_RESET = BIT(5), - SNOR_F_4B_OPCODES = BIT(6), - SNOR_F_HAS_4BAIT = BIT(7), - SNOR_F_HAS_LOCK = BIT(8), - SNOR_F_HAS_16BIT_SR = BIT(9), - SNOR_F_NO_READ_CR = BIT(10), - SNOR_F_HAS_SR_TB_BIT6 = BIT(11), - SNOR_F_HAS_4BIT_BP = BIT(12), - SNOR_F_HAS_SR_BP3_BIT6 = BIT(13), - SNOR_F_IO_MODE_EN_VOLATILE = BIT(14), - SNOR_F_SOFT_RESET = BIT(15), - SNOR_F_SWP_IS_VOLATILE = BIT(16), + SNOR_F_HAS_SR_TB = BIT(0), + SNOR_F_NO_OP_CHIP_ERASE = BIT(1), + SNOR_F_BROKEN_RESET = BIT(2), + SNOR_F_4B_OPCODES = BIT(3), + SNOR_F_HAS_4BAIT = BIT(4), + SNOR_F_HAS_LOCK = BIT(5), + SNOR_F_HAS_16BIT_SR = BIT(6), + SNOR_F_NO_READ_CR = BIT(7), + SNOR_F_HAS_SR_TB_BIT6 = BIT(8), + SNOR_F_HAS_4BIT_BP = BIT(9), + SNOR_F_HAS_SR_BP3_BIT6 = BIT(10), + SNOR_F_IO_MODE_EN_VOLATILE = BIT(11), + SNOR_F_SOFT_RESET = BIT(12), + SNOR_F_SWP_IS_VOLATILE = BIT(13), }; struct spi_nor_read_command { -- 2.30.2