| Message ID | 20230807-mtd-flash-info-db-rework-v3-3-e60548861b10@kernel.org |
|---|---|
| State | Accepted |
| Delegated to: | Ambarus Tudor |
| Headers | show |
| Series | mtd: spi-nor: clean the flash_info database up | expand |
On 08.09.2023 13:16, Michael Walle wrote: > In commit 59273180299a ("mtd: spi-nor: Create macros to define chip IDs > and geometries") SPI_NOR_ID() were introduced, but it did only update ^was. I will update when applying. > the INFO() macro in core.h. Also use it in S3AN_INFO(). > > Signed-off-by: Michael Walle <mwalle@kernel.org> > Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org> > --- > 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), \ >
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), \
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 <mwalle@kernel.org> Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org> --- drivers/mtd/spi-nor/xilinx.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)