michaelh/zephyr
1
0
Fork 0
Code Releases Activity

treewide: update flash_area name retrieval

Browse source 
Update usage of `flash_area->fa_dev_name` to `flash_area->fa_dev->name`.

Signed-off-by: Jordan Yates <jordan.yates@data61.csiro.au>
This commit is contained in:
Jordan Yates 2022-07-02 22:07:33 +10:00 • committed by Carles Cufí
commit 75680f7ae0
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
samples/subsys/fs/littlefs/src/main.c
View file

@ -247,7 +247,7 @@ static int littlefs_flash_erase(unsigned int id)
}
LOG_PRINTK("Area %u at 0x%x on %s for %u bytes\n",
id, (unsigned int)pfa->fa_off, pfa->fa_dev_name,
id, (unsigned int)pfa->fa_off, pfa->fa_dev->name,
(unsigned int)pfa->fa_size);
/* Optional wipe flash contents */

2
samples/subsys/usb/mass/src/main.c
View file

@ -40,7 +40,7 @@ static int setup_flash(struct fs_mount_t *mnt)
rc = flash_area_open(id, &pfa);
printk("Area %u at 0x%x on %s for %u bytes\n",
id, (unsigned int)pfa->fa_off, pfa->fa_dev_name,
id, (unsigned int)pfa->fa_off, pfa->fa_dev->name,
(unsigned int)pfa->fa_size);
if (rc < 0 && IS_ENABLED(CONFIG_APP_WIPE_STORAGE)) {

2
subsys/fs/littlefs_fs.c
View file

@ -640,7 +640,7 @@ static int littlefs_flash_init(struct fs_mount_t *mountp)
dev = flash_area_get_device(*fap);
if (dev == NULL) {
LOG_ERR("can't get flash device: %s",
(*fap)->fa_dev_name);
(*fap)->fa_dev->name);
return -ENODEV;
}

2
subsys/settings/src/settings_nvs.c
View file

@ -315,7 +315,7 @@ int settings_backend_init(void)
default_settings_nvs.cf_nvs.sector_size = nvs_sector_size;
default_settings_nvs.cf_nvs.sector_count = cnt;
default_settings_nvs.cf_nvs.offset = fa->fa_off;
default_settings_nvs.flash_dev_name = fa->fa_dev_name;
default_settings_nvs.flash_dev_name = fa->fa_dev->name;
rc = settings_nvs_backend_init(&default_settings_nvs);
if (rc) {

2
subsys/storage/flash_map/flash_map_shell.c
View file

@ -24,7 +24,7 @@ static void fa_cb(const struct flash_area *fa, void *user_data)
struct shell *shell = user_data;
shell_print(shell, "%-4d %-8d %-20s 0x%-10x 0x%-12x",
fa->fa_id, fa->fa_device_id, fa->fa_dev_name,
fa->fa_id, fa->fa_device_id, fa->fa_dev->name,
fa->fa_off, fa->fa_size);
}