From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 946F037D124 for ; Mon, 1 Jun 2026 12:54:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780318492; cv=none; b=qfZd7+8Ljt6OoNKuNwmMQOdOUn8E+FxJ3IF6RbygJ96dveI05NMV/6LPN/dxQTs5P66f1f3fEw9g8PbIdnus7G2u4NgjULakyyI3Otnm0yujoUdJ+99PLoiKHG19y8ngk//waXKsA/0vnj1ppExRGPljkPZdGCHDrtZHagJS2aE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780318492; c=relaxed/simple; bh=IB28kKFx659p3NJpOTcOUNOFj0dbgZvCgBOOn51N2EQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IdrvApHgE0D4jXF/vDUFmyzRbLbDu4PfxYlAgsgzmn/A1/JTRctuW9Pch5cA624Z7CBwt0yVywmL6PDX5Zf2b0DpSebbDItID5GPDF5DMDBdrMTSneC6LHC5kask6TmvwH04tTHSRL8sIVU2cL1LuuOvlexihRPtn34ZLT7YeJQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Li7n5zTZ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Li7n5zTZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 478521F00893; Mon, 1 Jun 2026 12:54:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780318489; bh=9p6z7/d9i9lSMpov6UMYK7LeSDt2zL1nMGwV4PCKtI0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Li7n5zTZ2WzGjvmhb9rD5hJLYY2Qt0lzif3YjezZwDVW/IRXFbuB/LqnhG8RoaFoe J0i2o6njeSXCaJoBUydIbH0rnNWfBYKMrCzUDBfvq82IgkWUjzcbivrwlutWr0Y4rP thAyGeDei1gV/Ow1qg+pylzytYC1cXYOJkcw1HwEve1joEFwMKtb1MEEBahpOjtBic oO6aBHH1M9ZHjPiFFHYQvCbh+JXvrzTmRHGDUZqn2//kGX8yUfITjC56k2bbQ4AKr8 IHaU2x5OmbvUFp2gkCpFRkSBe+zgxko9poaEWQIVm1QVQO0ZugLOzli1NLDuCE1C85 WtA/ZD7gPxohQ== From: Michael Walle To: Pratyush Yadav , Michael Walle , Takahiro Kuwano , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus Cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 2/3] mtd: spi-nor: don't clear the SNOR_F_4B_OPCODES flag on failure Date: Mon, 1 Jun 2026 14:52:44 +0200 Message-ID: <20260601125438.3481722-3-mwalle@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260601125438.3481722-1-mwalle@kernel.org> References: <20260601125438.3481722-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This was introduced in commit 548ed6847f530 ("mtd: spi-nor: Add the SNOR_F_4B_OPCODES flag"). It looks like it was the rollback mechanism if parsing the SFDP failed, but was setting that flag first. Nowadays, that flag can only be set if spi_nor_parse_4bait() was successful. IOW, the flags won't be left in an undefined state if parsing SFDP fails. Remove the unneeded code to be able to rework spi_nor_init_params(). Signed-off-by: Michael Walle --- drivers/mtd/spi-nor/core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c index 4046e137531f..fbf8c2d9c6b5 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c @@ -3066,10 +3066,8 @@ static void spi_nor_sfdp_init_params_deprecated(struct spi_nor *nor) memcpy(&sfdp_params, nor->params, sizeof(sfdp_params)); - if (spi_nor_parse_sfdp(nor)) { + if (spi_nor_parse_sfdp(nor)) memcpy(nor->params, &sfdp_params, sizeof(*nor->params)); - nor->flags &= ~SNOR_F_4B_OPCODES; - } } /** -- 2.47.3