mtd: Use of_property_read_bool() for boolean properties
PATCH 1/1 mtd: Use of_property_read_bool() for boolean properties
It is preferred to use typed property access functions (i.e. of_property_read_<type> functions) rather than low-level of_get_property/of_find_property functions for reading properties. Convert reading boolean properties to to of_property_read_bool().
Signed-off-by Rob Herring <[email protected]>
--- drivers/mtd/devices/spear_smi.c | 4 ++-- drivers/mtd/maps/sun_uflash.c | 2 +- drivers/mtd/mtdcore.c | 2 +- drivers/mtd/nand/raw/fsmc_nand.c | 2 +- drivers/mtd/nand/raw/nand_macronix.c | 5 ++--- drivers/mtd/spi-nor/controllers/nxp-spifi.c | 4 ++-- 6 files changed, 9 insertions(+), 10 deletions(-)
drivers/mtd/devices/spear_smi.c +2 -2
@@ -820,8 +820,8 @@ static int spear_smi_probe_config_dt(struct platform_device *pdev, pdata->board_flash_info->mem_base =be32_to_cpup (&addr[0 ]); pdata->board_flash_info->size =be32_to_cpup (&addr[1 ]); -if (of_get_property (pp,"st,smi-fast-mode" ,NULL )) - pdata->board_flash_info->fast_mode =1 ; + pdata->board_flash_info->fast_mode = +of_property_read_bool (pp,"st,smi-fast-mode" ); i++; }
drivers/mtd/maps/sun_uflash.c +1 -1
@@ -112,7 +112,7 @@ static int uflash_probe(struct platform_device *op)/* Flashprom must have the "user" property in order to * be used by this driver. */ -if (!of_find_property (dp,"user" ,NULL )) +if (!of_property_read_bool (dp,"user" ))return -ENODEV ;return uflash_devinit (op, dp);
drivers/mtd/mtdcore.c +1 -1
@@ -739,7 +739,7 @@ int add_mtd_device(struct mtd_info *mtd)mutex_unlock (&mtd_table_mutex); -if (of_find_property (mtd_get_of_node (mtd),"linux,rootfs" ,NULL )) { +if (of_property_read_bool (mtd_get_of_node (mtd),"linux,rootfs" )) {if (IS_BUILTIN (CONFIG_MTD )) {pr_info ("mtd: setting mtd%d (%s) as root device\n" , mtd->index, mtd->name);ROOT_DEV =MKDEV (MTD_BLOCK_MAJOR , mtd->index);
drivers/mtd/nand/raw/fsmc_nand.c +1 -1
@@ -880,7 +880,7 @@ static int fsmc_nand_probe_config_dt(struct platform_device *pdev, } } -if (of_get_property (np,"nand-skip-bbtscan" ,NULL )) +if (of_property_read_bool (np,"nand-skip-bbtscan" )) nand->options |=NAND_SKIP_BBTSCAN ; host->dev_timings = devm_kzalloc(&pdev->dev,
drivers/mtd/nand/raw/nand_macronix.c +2 -3
@@ -93,14 +93,13 @@ static void macronix_nand_onfi_init(struct nand_chip *chip)struct nand_parameters *p = &chip->parameters;struct nand_onfi_vendor_macronix *mxic;struct device_node *dn =nand_get_flash_node (chip); -int rand_otp =0 ; +int rand_otp;int ret;if (!p->onfi)return ; -if (of_find_property (dn,"mxic,enable-randomizer-otp" ,NULL )) - rand_otp =1 ; + rand_otp =of_property_read_bool (dn,"mxic,enable-randomizer-otp" ); mxic = (struct nand_onfi_vendor_macronix *)p->onfi->vendor;/* Subpage write is prohibited in randomizer operatoin */
drivers/mtd/spi-nor/controllers/nxp-spifi.c +2 -2
@@ -305,10 +305,10 @@ static int nxp_spifi_setup_flash(struct nxp_spifi *spifi, } } -if (of_find_property (np,"spi-cpha" ,NULL )) +if (of_property_read_bool (np,"spi-cpha" )) mode |=SPI_CPHA ; -if (of_find_property (np,"spi-cpol" ,NULL )) +if (of_property_read_bool (np,"spi-cpol" )) mode |=SPI_CPOL ;/* Setup control register defaults */
Signature · 6 lines
2.39.2 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Quoted 6 lines · Rob Herring
It is preferred to use typed property access functions (i.e. of_property_read_<type> functions) rather than low-level of_get_property/of_find_property functions for reading properties. Convert reading boolean properties to to
of_property_read_bool().Signed-off-by Rob Herring <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.
Miquel