Skip to content

Commit fa08cc6

Browse files
mstasiaknordicrlubos
authored andcommitted
[nrf fromtree] modules: hal_nordic: remove deprecated error code
NRFX_ERROR_ALREADY_INITIALIZED has beed deprecated and repleaced by NRFX_ERROR_ALREADY. Signed-off-by: Michał Stasiak <[email protected]> (cherry picked from commit 4abc1dd)
1 parent 06b7168 commit fa08cc6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/usb/device/usb_dc_nrfx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1914,7 +1914,7 @@ static int usb_init(void)
19141914
return -EIO;
19151915
}
19161916

1917-
/* Ignore the return value, as NRFX_ERROR_ALREADY_INITIALIZED is not
1917+
/* Ignore the return value, as NRFX_ERROR_ALREADY is not
19181918
* a problem here.
19191919
*/
19201920
(void)nrfx_power_init(&power_config);

modules/hal_nordic/nrfx/nrfx_glue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ char const *nrfx_error_string_get(nrfx_err_t code)
3838
NRFX_ERROR_STRING_CASE(NRFX_ERROR_NULL);
3939
NRFX_ERROR_STRING_CASE(NRFX_ERROR_INVALID_ADDR);
4040
NRFX_ERROR_STRING_CASE(NRFX_ERROR_BUSY);
41-
NRFX_ERROR_STRING_CASE(NRFX_ERROR_ALREADY_INITIALIZED);
41+
NRFX_ERROR_STRING_CASE(NRFX_ERROR_ALREADY);
4242
NRFX_ERROR_STRING_CASE(NRFX_ERROR_DRV_TWI_ERR_OVERRUN);
4343
NRFX_ERROR_STRING_CASE(NRFX_ERROR_DRV_TWI_ERR_ANACK);
4444
NRFX_ERROR_STRING_CASE(NRFX_ERROR_DRV_TWI_ERR_DNACK);

0 commit comments

Comments
 (0)