michaelh/zephyr
1
0
Fork 0
Code Releases Activity

storage/flash_map: Switch flash_area_layout to use flash_area_open

Browse source 
The function should use flash_area_open rather than directly
using get_flash_area_from_id.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2021-06-29 09:38:26 +00:00 • committed by Christopher Friedt
commit 51e8db228b
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
subsys/storage/flash_map/flash_map.c
View file

@ -126,13 +126,10 @@ static int flash_area_layout(int idx, uint32_t *cnt, void *ret,
flash_page_cb cb, struct layout_data *cb_data) flash_page_cb cb, struct layout_data *cb_data)
{ {
const struct device *flash_dev; const struct device *flash_dev;
cb_data->area_idx = idx;
const struct flash_area *fa; const struct flash_area *fa;
int rc = flash_area_open(idx, &fa);
fa = get_flash_area_from_id(idx); if (rc < 0 || fa == NULL) {
if (fa == NULL) {
return -EINVAL; return -EINVAL;
} }
@ -146,6 +143,7 @@ flash_page_cb cb, struct layout_data *cb_data)
cb_data->status = 0; cb_data->status = 0;
flash_dev = device_get_binding(fa->fa_dev_name); flash_dev = device_get_binding(fa->fa_dev_name);
flash_area_close(fa);
if (flash_dev == NULL) { if (flash_dev == NULL) {
return -ENODEV; return -ENODEV;
} }