diff --git a/arch/arm/src/cxd56xx/cxd56_sfc.c b/arch/arm/src/cxd56xx/cxd56_sfc.c index ec81dad34e9..3ed01c8b777 100644 --- a/arch/arm/src/cxd56xx/cxd56_sfc.c +++ b/arch/arm/src/cxd56xx/cxd56_sfc.c @@ -218,7 +218,6 @@ static int cxd56_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->density / PAGE_SIZE; info->sectorsize = PAGE_SIZE; info->startsector = 0; diff --git a/arch/arm/src/lc823450/lc823450_mtd.c b/arch/arm/src/lc823450/lc823450_mtd.c index b56e2fd39a2..b3195a7ea7e 100644 --- a/arch/arm/src/lc823450/lc823450_mtd.c +++ b/arch/arm/src/lc823450/lc823450_mtd.c @@ -355,7 +355,6 @@ static int lc823450_ioctl(FAR struct mtd_dev_s *dev, int cmd, (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->nblocks; info->sectorsize = priv->blocksize; info->startsector = 0; diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.c b/arch/arm/src/lpc43xx/lpc43_spifi.c index 2aa718ab2af..8d21b2a5a86 100644 --- a/arch/arm/src/lpc43xx/lpc43_spifi.c +++ b/arch/arm/src/lpc43xx/lpc43_spifi.c @@ -893,7 +893,6 @@ static int lpc43_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; #ifdef CONFIG_SPIFI_SECTOR512 info->numsectors = priv->nblocks << (SPIFI_BLKSHIFT - SPIFI_512SHIFT); diff --git a/arch/arm/src/rtl8720c/ameba_flash.c b/arch/arm/src/rtl8720c/ameba_flash.c index 86ad50c2f83..9d2a72e6ec2 100644 --- a/arch/arm/src/rtl8720c/ameba_flash.c +++ b/arch/arm/src/rtl8720c/ameba_flash.c @@ -251,7 +251,6 @@ static int ameba_flash_ioctl(FAR struct mtd_dev_s *dev, (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->nsectors * AMEBA_SECTOR_SIZE / AMEBA_PAGE_SIZE; info->sectorsize = AMEBA_PAGE_SIZE; diff --git a/arch/arm/src/tiva/common/tiva_flash.c b/arch/arm/src/tiva/common/tiva_flash.c index 28747b8e764..e8087980ac7 100644 --- a/arch/arm/src/tiva/common/tiva_flash.c +++ b/arch/arm/src/tiva/common/tiva_flash.c @@ -400,7 +400,6 @@ static int tiva_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = TIVA_VIRTUAL_NPAGES; info->sectorsize = TIVA_FLASH_PAGESIZE; info->startsector = 0; diff --git a/arch/risc-v/src/bl602/bl602_spiflash.c b/arch/risc-v/src/bl602/bl602_spiflash.c index 225f741275a..0740c301d12 100644 --- a/arch/risc-v/src/bl602/bl602_spiflash.c +++ b/arch/risc-v/src/bl602/bl602_spiflash.c @@ -313,7 +313,6 @@ int bl602_ioctl(FAR struct mtd_dev_s *dev, int cmd, (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->config->flash_size / SPIFLASH_BLOCKSIZE; info->sectorsize = SPIFLASH_BLOCKSIZE; diff --git a/arch/risc-v/src/esp32c3/esp32c3_spiflash.c b/arch/risc-v/src/esp32c3/esp32c3_spiflash.c index a9bfe59a802..059757a5918 100644 --- a/arch/risc-v/src/esp32c3/esp32c3_spiflash.c +++ b/arch/risc-v/src/esp32c3/esp32c3_spiflash.c @@ -880,7 +880,6 @@ static int esp32c3_ioctl(struct mtd_dev_s *dev, int cmd, struct partition_info_s *info = (struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = SPI_FLASH_SIZE / SPI_FLASH_BLK_SIZE; info->sectorsize = SPI_FLASH_BLK_SIZE; info->startsector = 0; diff --git a/arch/xtensa/src/esp32/esp32_spiflash.c b/arch/xtensa/src/esp32/esp32_spiflash.c index b157e5ec25d..c813afe6e41 100644 --- a/arch/xtensa/src/esp32/esp32_spiflash.c +++ b/arch/xtensa/src/esp32/esp32_spiflash.c @@ -1936,7 +1936,6 @@ static int esp32_ioctl(FAR struct mtd_dev_s *dev, int cmd, (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = MTD_SIZE(priv) / MTD_BLKSIZE(priv); info->sectorsize = MTD_BLKSIZE(priv); info->startsector = 0; diff --git a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_flexspi_nor.c b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_flexspi_nor.c index 51d51124334..0373bf21db4 100644 --- a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_flexspi_nor.c +++ b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_flexspi_nor.c @@ -584,7 +584,6 @@ static int imxrt_flexspi_nor_ioctl(FAR struct mtd_dev_s *dev, (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = 32768; /* 8MB only */ info->sectorsize = NOR_PAGE_SIZE; info->startsector = 0; diff --git a/drivers/mtd/at24xx.c b/drivers/mtd/at24xx.c index b89d04b5033..b59aa534451 100644 --- a/drivers/mtd/at24xx.c +++ b/drivers/mtd/at24xx.c @@ -638,7 +638,6 @@ static int at24c_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; #if CONFIG_AT24XX_MTD_BLOCKSIZE > AT24XX_PAGESIZE info->numsectors = (CONFIG_AT24XX_SIZE * 1024 / 8) / CONFIG_AT24XX_MTD_BLOCKSIZE; diff --git a/drivers/mtd/at25.c b/drivers/mtd/at25.c index 8594064ec7b..95be2d72766 100644 --- a/drivers/mtd/at25.c +++ b/drivers/mtd/at25.c @@ -645,7 +645,6 @@ static int at25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->nsectors << (priv->sectorshift - priv->pageshift); info->sectorsize = 1 << priv->pageshift; diff --git a/drivers/mtd/at45db.c b/drivers/mtd/at45db.c index 04bc4c94b2a..b244aae6338 100644 --- a/drivers/mtd/at45db.c +++ b/drivers/mtd/at45db.c @@ -811,7 +811,6 @@ static int at45db_ioctl(FAR struct mtd_dev_s *mtd, (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->npages; info->sectorsize = 1 << priv->pageshift; info->startsector = 0; diff --git a/drivers/mtd/filemtd.c b/drivers/mtd/filemtd.c index ca800e8f898..0cccae06c08 100644 --- a/drivers/mtd/filemtd.c +++ b/drivers/mtd/filemtd.c @@ -442,7 +442,6 @@ static int filemtd_ioctl(FAR struct mtd_dev_s *dev, int cmd, (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->nblocks * priv->erasesize / priv->blocksize; info->sectorsize = priv->blocksize; diff --git a/drivers/mtd/gd25.c b/drivers/mtd/gd25.c index 55815beae76..69ad85b832a 100644 --- a/drivers/mtd/gd25.c +++ b/drivers/mtd/gd25.c @@ -951,7 +951,6 @@ static int gd25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->nsectors * GD25_SECTOR_SIZE / GD25_PAGE_SIZE; info->sectorsize = GD25_PAGE_SIZE; diff --git a/drivers/mtd/gd5f.c b/drivers/mtd/gd5f.c index fb3c4e0bb09..05a10074523 100644 --- a/drivers/mtd/gd5f.c +++ b/drivers/mtd/gd5f.c @@ -787,7 +787,6 @@ static int gd5f_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->nsectors << (priv->sectorshift - priv->pageshift); info->sectorsize = 1 << priv->pageshift; diff --git a/drivers/mtd/is25xp.c b/drivers/mtd/is25xp.c index 087519f5c02..8f36fcc99c8 100644 --- a/drivers/mtd/is25xp.c +++ b/drivers/mtd/is25xp.c @@ -960,7 +960,6 @@ static int is25xp_ioctl(FAR struct mtd_dev_s *dev, (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->nsectors << (priv->sectorshift - priv->pageshift); info->sectorsize = 1 << priv->pageshift; diff --git a/drivers/mtd/m25px.c b/drivers/mtd/m25px.c index 6e2b43d175d..6b3e1989786 100644 --- a/drivers/mtd/m25px.c +++ b/drivers/mtd/m25px.c @@ -1042,7 +1042,6 @@ static int m25p_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->nsectors << (priv->sectorshift - priv->pageshift); info->sectorsize = 1 << priv->pageshift; diff --git a/drivers/mtd/mtd_nand.c b/drivers/mtd/mtd_nand.c index 614fd348b28..1a8fc9dd512 100644 --- a/drivers/mtd/mtd_nand.c +++ b/drivers/mtd/mtd_nand.c @@ -812,7 +812,6 @@ static int nand_ioctl(struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = nandmodel_getdevblocks(model) * nandmodel_getbyteblocksize(model) / model->pagesize; diff --git a/drivers/mtd/mtd_partition.c b/drivers/mtd/mtd_partition.c index bc5588af19f..8321fc6a40e 100644 --- a/drivers/mtd/mtd_partition.c +++ b/drivers/mtd/mtd_partition.c @@ -420,7 +420,6 @@ static int part_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->neraseblocks * priv->blkpererase; info->sectorsize = priv->blocksize; info->startsector = priv->firstblock; diff --git a/drivers/mtd/mtd_progmem.c b/drivers/mtd/mtd_progmem.c index 1d3c79916c3..2b173014a41 100644 --- a/drivers/mtd/mtd_progmem.c +++ b/drivers/mtd/mtd_progmem.c @@ -333,7 +333,6 @@ static int progmem_ioctl(FAR struct mtd_dev_s *dev, int cmd, (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = up_progmem_neraseblocks() << (priv->ersshift - priv->blkshift); info->sectorsize = 1 << priv->blkshift; diff --git a/drivers/mtd/mtd_rwbuffer.c b/drivers/mtd/mtd_rwbuffer.c index 1a4d3457a26..154c6fcbd06 100644 --- a/drivers/mtd/mtd_rwbuffer.c +++ b/drivers/mtd/mtd_rwbuffer.c @@ -302,7 +302,6 @@ static int mtd_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->rwb.nblocks; info->sectorsize = priv->rwb.blocksize; info->startsector = 0; diff --git a/drivers/mtd/mx25lx.c b/drivers/mtd/mx25lx.c index 72bf491e029..d23229d200d 100644 --- a/drivers/mtd/mx25lx.c +++ b/drivers/mtd/mx25lx.c @@ -1089,7 +1089,6 @@ static int mx25l_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; #ifdef CONFIG_MX25L_SECTOR512 info->numsectors = priv->nsectors << (priv->sectorshift - MX25L_SECTOR512_SHIFT); diff --git a/drivers/mtd/mx25rxx.c b/drivers/mtd/mx25rxx.c index 19092610ec7..bfb1da865ce 100644 --- a/drivers/mtd/mx25rxx.c +++ b/drivers/mtd/mx25rxx.c @@ -759,7 +759,6 @@ int mx25rxx_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; #ifdef CONFIG_MX25RXX_SECTOR512 info->numsectors = priv->nsectors << (priv->sectorshift - MX25RXX_SECTOR512_SHIFT); diff --git a/drivers/mtd/mx35.c b/drivers/mtd/mx35.c index cdf59fd3aca..9df2fdecb34 100644 --- a/drivers/mtd/mx35.c +++ b/drivers/mtd/mx35.c @@ -817,7 +817,6 @@ static int mx35_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->nsectors << (priv->sectorshift - priv->pageshift); info->sectorsize = 1 << priv->pageshift; diff --git a/drivers/mtd/n25qxxx.c b/drivers/mtd/n25qxxx.c index 3321832a9fd..bf6c6bb3df5 100644 --- a/drivers/mtd/n25qxxx.c +++ b/drivers/mtd/n25qxxx.c @@ -1407,7 +1407,6 @@ static int n25qxxx_ioctl(FAR struct mtd_dev_s *dev, (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; #ifdef CONFIG_N25QXXX_SECTOR512 info->numsectors = priv->nsectors << (priv->sectorshift - N25QXXX_SECTOR512_SHIFT); diff --git a/drivers/mtd/rammtd.c b/drivers/mtd/rammtd.c index b1396bfe865..c3014900a8f 100644 --- a/drivers/mtd/rammtd.c +++ b/drivers/mtd/rammtd.c @@ -405,7 +405,6 @@ static int ram_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->nblocks * CONFIG_RAMMTD_ERASESIZE / CONFIG_RAMMTD_BLOCKSIZE; diff --git a/drivers/mtd/ramtron.c b/drivers/mtd/ramtron.c index 0495af0298b..df282ab43da 100644 --- a/drivers/mtd/ramtron.c +++ b/drivers/mtd/ramtron.c @@ -960,7 +960,6 @@ static int ramtron_ioctl(FAR struct mtd_dev_s *dev, (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->nsectors * (priv->sectorshift - priv->pageshift); info->sectorsize = 1 << priv->pageshift; diff --git a/drivers/mtd/s25fl1.c b/drivers/mtd/s25fl1.c index 0688cdf7016..9b336df596a 100644 --- a/drivers/mtd/s25fl1.c +++ b/drivers/mtd/s25fl1.c @@ -1453,7 +1453,6 @@ static int s25fl1_ioctl(FAR struct mtd_dev_s *dev, (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; #ifdef CONFIG_S25FL1_SECTOR512 info->numsectors = priv->nsectors << (priv->sectorshift - S25FL1_SECTOR512_SHIFT); diff --git a/drivers/mtd/sector512.c b/drivers/mtd/sector512.c index b0868c6683f..b963079ffe3 100644 --- a/drivers/mtd/sector512.c +++ b/drivers/mtd/sector512.c @@ -549,7 +549,6 @@ static int s512_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->neblocks * priv->stdperblock; info->sectorsize = SECTOR_512; info->startsector = 0; diff --git a/drivers/mtd/skeleton.c b/drivers/mtd/skeleton.c index 681bcb4aed8..2597100319b 100644 --- a/drivers/mtd/skeleton.c +++ b/drivers/mtd/skeleton.c @@ -265,7 +265,6 @@ static int skel_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = 8192; info->sectorsize = 512; info->startsector = 0; diff --git a/drivers/mtd/sst25.c b/drivers/mtd/sst25.c index f319f9d5cf0..baf1805a85d 100644 --- a/drivers/mtd/sst25.c +++ b/drivers/mtd/sst25.c @@ -1201,7 +1201,6 @@ static int sst25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; #ifdef CONFIG_SST25_SECTOR512 info->numsectors = priv->nsectors << (priv->sectorshift - SST25_SECTOR_SHIFT); diff --git a/drivers/mtd/sst25xx.c b/drivers/mtd/sst25xx.c index bfd2f6a94b6..d36153cbed1 100644 --- a/drivers/mtd/sst25xx.c +++ b/drivers/mtd/sst25xx.c @@ -899,7 +899,6 @@ static int sst25xx_ioctl(FAR struct mtd_dev_s *dev, int cmd, (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->nsectors * (priv->sectorshift - priv->pageshift); info->sectorsize = 1 << priv->pageshift; diff --git a/drivers/mtd/sst26.c b/drivers/mtd/sst26.c index 1226a3cfca3..f90af047ff9 100644 --- a/drivers/mtd/sst26.c +++ b/drivers/mtd/sst26.c @@ -904,7 +904,6 @@ static int sst26_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->nsectors * (priv->sectorshift - priv->pageshift); info->sectorsize = 1 << priv->pageshift; diff --git a/drivers/mtd/sst39vf.c b/drivers/mtd/sst39vf.c index f4205cf140e..49f166c3d06 100644 --- a/drivers/mtd/sst39vf.c +++ b/drivers/mtd/sst39vf.c @@ -742,7 +742,6 @@ static int sst39vf_ioctl(FAR struct mtd_dev_s *dev, (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; info->numsectors = priv->chip->nsectors; info->sectorsize = priv->chip->sectorsize; info->startsector = 0; diff --git a/drivers/mtd/w25.c b/drivers/mtd/w25.c index 5533483a9ed..50e91bc74c1 100644 --- a/drivers/mtd/w25.c +++ b/drivers/mtd/w25.c @@ -1329,7 +1329,6 @@ static int w25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; #ifdef CONFIG_W25_SECTOR512 info->numsectors = priv->nsectors << (W25_SECTOR_SHIFT - W25_SECTOR512_SHIFT); diff --git a/drivers/mtd/w25qxxxjv.c b/drivers/mtd/w25qxxxjv.c index 5c8560c4ece..7bb4e352527 100644 --- a/drivers/mtd/w25qxxxjv.c +++ b/drivers/mtd/w25qxxxjv.c @@ -1413,7 +1413,6 @@ static int w25qxxxjv_ioctl(FAR struct mtd_dev_s *dev, (FAR struct partition_info_s *)arg; if (info != NULL) { - info->magic = 0; #ifdef CONFIG_W25QXXXJV_SECTOR512 info->numsectors = priv->nsectors << (priv->sectorshift - W25QXXXJV_SECTOR512_SHIFT); diff --git a/fs/driver/fs_blockpartition.c b/fs/driver/fs_blockpartition.c index d4c195f5b37..f5b6b567a79 100644 --- a/fs/driver/fs_blockpartition.c +++ b/fs/driver/fs_blockpartition.c @@ -223,7 +223,6 @@ static int part_ioctl(FAR struct inode *inode, int cmd, unsigned long arg) (FAR struct partition_info_s *)ptr_arg; if (info != NULL) { - info->magic = 0; info->numsectors = dev->nsectors; info->sectorsize = dev->sectorsize; info->startsector = dev->firstsector; diff --git a/include/nuttx/fs/fs.h b/include/nuttx/fs/fs.h index 81b12299543..24080776414 100644 --- a/include/nuttx/fs/fs.h +++ b/include/nuttx/fs/fs.h @@ -226,8 +226,6 @@ struct geometry struct partition_info_s { - uint32_t magic; /* File system magic, 0 for RAW - * (see ) */ size_t numsectors; /* Number of sectors in the partition */ size_t sectorsize; /* Size in bytes of a single sector */ off_t startsector; /* Offset to the first section/block of the