treewide: align to nrfx_nvmc returning errno

NRFX NVMC driver now returns errno values.

Signed-off-by: Michał Stasiak <[email protected]>

Author: mstasiaknordic

tests/subsys/bootloader/bl_validation/src/main.c

@@ -42,9 +42,9 @@ ZTEST(bl_validation_test, test_validation)
 
 	for (uint32_t erase_addr = new_addr; erase_addr < (new_addr + copy_len);
 	     erase_addr += DT_PROP(DT_CHOSEN(zephyr_flash), erase_block_size)) {
-		uint32_t ret = nrfx_nvmc_page_erase(erase_addr);
+		int ret = nrfx_nvmc_page_erase(erase_addr);
 
-		zassert_equal(NRFX_SUCCESS, ret, "Erase failed.\r\n");
+		zassert_equal(0, ret, "Erase failed.\r\n");
 	}
 	nrfx_nvmc_words_write(new_addr, (const uint32_t *)PM_ADDRESS,
 		(copy_len + 3) / 4);
@@ -82,19 +82,19 @@ ZTEST(bl_validation_test, test_s1)
 
 	for (uint32_t erase_addr = new_addr; erase_addr < (new_addr + move_len);
 	     erase_addr += DT_PROP(DT_CHOSEN(zephyr_flash), erase_block_size)) {
-		uint32_t ret = nrfx_nvmc_page_erase(erase_addr);
+		int ret = nrfx_nvmc_page_erase(erase_addr);
 
-		zassert_equal(NRFX_SUCCESS, ret, "Erase failed.\r\n");
+		zassert_equal(0, ret, "Erase failed.\r\n");
 	}
 
 	nrfx_nvmc_words_write(new_addr, (const uint32_t *)PM_S1_ADDRESS,
 			      (move_len + 3) / 4);
 
 	for (uint32_t erase_addr = PM_S1_ADDRESS; erase_addr < new_addr;
 	     erase_addr += DT_PROP(DT_CHOSEN(zephyr_flash), erase_block_size)) {
-		uint32_t ret = nrfx_nvmc_page_erase(erase_addr);
+		int ret = nrfx_nvmc_page_erase(erase_addr);
 
-		zassert_equal(NRFX_SUCCESS, ret, "Erase failed.\r\n");
+		zassert_equal(0, ret, "Erase failed.\r\n");
 	}
 
 	zassert_true(bl_validate_firmware(PM_S1_ADDRESS, new_addr), NULL);

tests/subsys/bootloader/bl_validation_neg/src/main.c

@@ -53,9 +53,9 @@ ZTEST(test_bl_validation_neg, test_validation_neg1)
 			s1_info_copied->valid, "Failed to invalidate S1.\r\n");
 		zassert_equal((uint32_t)s1_info_copied, PM_S1_ADDRESS,
 			"S1 info found at wrong address.\r\n");
-		uint32_t ret = nrfx_nvmc_page_erase(PM_S1_ADDRESS);
+		int ret = nrfx_nvmc_page_erase(PM_S1_ADDRESS);
 
-		zassert_equal(NRFX_SUCCESS, ret, "Erase failed.\r\n");
+		zassert_equal(0, ret, "Erase failed.\r\n");
 	} else {
 		/* First boot */
 
@@ -64,9 +64,9 @@ ZTEST(test_bl_validation_neg, test_validation_neg1)
 			erase_addr < (new_addr + copy_len);
 			erase_addr += DT_PROP(DT_CHOSEN(zephyr_flash),
 							erase_block_size)) {
-			uint32_t ret = nrfx_nvmc_page_erase(new_addr);
+			int ret = nrfx_nvmc_page_erase(new_addr);
 
-			zassert_equal(NRFX_SUCCESS, ret, "Erase failed.\r\n");
+			zassert_equal(0, ret, "Erase failed.\r\n");
 		}
 		nrfx_nvmc_words_write(new_addr, (const uint32_t *)PM_ADDRESS,
 			copy_len / 4);