[PATCH v2 40/41] mtd: spi-nor: atmel: drop duplicate entry

Michael Walle posted 41 patches 2 years, 3 months ago
There is a newer version of this series
[PATCH v2 40/41] mtd: spi-nor: atmel: drop duplicate entry
Posted by Michael Walle 2 years, 3 months ago
The Atmel AT26DF321 and AT25DF321 have the same ID. Both were just
discovered by reading their IDs, that is, there is no probing by name.
Thus only the first one in the list was ever probed. The AT25DF is the
newer series. Drop the older one.

Signed-off-by: Michael Walle <mwalle@kernel.org>
---
 drivers/mtd/spi-nor/atmel.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/mtd/spi-nor/atmel.c b/drivers/mtd/spi-nor/atmel.c
index 18e904962d0e..95f0e139284e 100644
--- a/drivers/mtd/spi-nor/atmel.c
+++ b/drivers/mtd/spi-nor/atmel.c
@@ -206,13 +206,6 @@ static const struct flash_info atmel_nor_parts[] = {
 		.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
 		.no_sfdp_flags = SECT_4K,
 		.fixups = &atmel_nor_global_protection_fixups
-	}, {
-		.id = SNOR_ID(0x1f, 0x47, 0x00),
-		.name = "at26df321",
-		.size = SZ_4M,
-		.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
-		.no_sfdp_flags = SECT_4K,
-		.fixups = &atmel_nor_global_protection_fixups
 	}, {
 		.id = SNOR_ID(0x1f, 0x47, 0x01),
 		.name = "at25df321a",

-- 
2.39.2
Re: [PATCH v2 40/41] mtd: spi-nor: atmel: drop duplicate entry
Posted by Tudor Ambarus 2 years, 3 months ago

On 22.08.2023 10:09, Michael Walle wrote:
> The Atmel AT26DF321 and AT25DF321 have the same ID. Both were just
> discovered by reading their IDs, that is, there is no probing by name.
> Thus only the first one in the list was ever probed. The AT25DF is the
> newer series. Drop the older one.
> 
> Signed-off-by: Michael Walle <mwalle@kernel.org>

keep the first entry, to have the name backward compatible. It's not a
hard rule to have the name backward compatible, but if we can, let's
keep it.


Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org>

> ---
>  drivers/mtd/spi-nor/atmel.c | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/drivers/mtd/spi-nor/atmel.c b/drivers/mtd/spi-nor/atmel.c
> index 18e904962d0e..95f0e139284e 100644
> --- a/drivers/mtd/spi-nor/atmel.c
> +++ b/drivers/mtd/spi-nor/atmel.c
> @@ -206,13 +206,6 @@ static const struct flash_info atmel_nor_parts[] = {
>  		.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
>  		.no_sfdp_flags = SECT_4K,
>  		.fixups = &atmel_nor_global_protection_fixups
> -	}, {
> -		.id = SNOR_ID(0x1f, 0x47, 0x00),
> -		.name = "at26df321",
> -		.size = SZ_4M,
> -		.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
> -		.no_sfdp_flags = SECT_4K,
> -		.fixups = &atmel_nor_global_protection_fixups
>  	}, {
>  		.id = SNOR_ID(0x1f, 0x47, 0x01),
>  		.name = "at25df321a",
>