[nrf fromlist] drivers: clock_control: Updated nrfx_clock_* error codes.

mif1-nordic · mif1-nordic · commit 5493f4180d04 · 2025-11-05T11:13:28.000+01:00
Updated nrfx_clock_* error codes.

Upstream PR #: 98908

Signed-off-by: Michal Frankiewicz &lt;michal.frankiewicz@nordicsemi.no&gt;
diff --git a/drivers/clock_control/clock_control_nrf.c b/drivers/clock_control/clock_control_nrf.c
@@ -800,7 +800,6 @@ static void hfclkaudio_init(void)
 
 static int clk_init(const struct device *dev)
 {
-	nrfx_err_t nrfx_err;
 	int err;
 	static const struct onoff_transitions transitions = {
 		.start = onoff_start,
@@ -814,8 +813,7 @@ static int clk_init(const struct device *dev)
 	IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority),
 		    nrfx_isr, nrfx_power_clock_irq_handler, 0);
 
-	nrfx_err = nrfx_clock_init(clock_event_handler);
-	if (nrfx_err != NRFX_SUCCESS) {
+	if (nrfx_clock_init(clock_event_handler) != 0) {
 		return -EIO;
 	}
 
diff --git a/samples/net/zperf/src/nrf5340_cpu_boost.c b/samples/net/zperf/src/nrf5340_cpu_boost.c
@@ -22,7 +22,6 @@ static int nrf53_cpu_boost(void)
 
 	/* For optimal performance, the CPU frequency should be set to 128 MHz */
 	err = nrfx_clock_divider_set(NRF_CLOCK_DOMAIN_HFCLK, NRF_CLOCK_HFCLK_DIV_1);
-	err -= NRFX_ERROR_BASE_NUM;
 	if (err != 0) {
 		LOG_WRN("Failed to set 128 MHz: %d", err);
 	}
diff --git a/subsys/bluetooth/audio/shell/bap_usb.c b/subsys/bluetooth/audio/shell/bap_usb.c
@@ -738,7 +738,6 @@ int bap_usb_init(void)
 		 */
 		err = nrfx_clock_divider_set(NRF_CLOCK_DOMAIN_HFCLK, NRF_CLOCK_HFCLK_DIV_1);
 
-		err -= NRFX_ERROR_BASE_NUM;
 		if (err != 0) {
 			LOG_WRN("Failed to set 128 MHz: %d", err);
 		}

Original file line number	Diff line number	Diff line change
`@@ -800,7 +800,6 @@ static void hfclkaudio_init(void)`
`800`	`800`
`801`	`801`	`static int clk_init(const struct device *dev)`
`802`	`802`	`{`
`803`		`- nrfx_err_t nrfx_err;`
`804`	`803`	`int err;`
`805`	`804`	`static const struct onoff_transitions transitions = {`
`806`	`805`	`.start = onoff_start,`
`@@ -814,8 +813,7 @@ static int clk_init(const struct device *dev)`
`814`	`813`	`IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority),`
`815`	`814`	`nrfx_isr, nrfx_power_clock_irq_handler, 0);`
`816`	`815`
`817`		`- nrfx_err = nrfx_clock_init(clock_event_handler);`
`818`		`- if (nrfx_err != NRFX_SUCCESS) {`
	`816`	`+ if (nrfx_clock_init(clock_event_handler) != 0) {`
`819`	`817`	`return -EIO;`
`820`	`818`	`}`
`821`	`819`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ static int nrf53_cpu_boost(void)`
`22`	`22`
`23`	`23`	`/* For optimal performance, the CPU frequency should be set to 128 MHz */`
`24`	`24`	`err = nrfx_clock_divider_set(NRF_CLOCK_DOMAIN_HFCLK, NRF_CLOCK_HFCLK_DIV_1);`
`25`		`- err -= NRFX_ERROR_BASE_NUM;`
`26`	`25`	`if (err != 0) {`
`27`	`26`	`LOG_WRN("Failed to set 128 MHz: %d", err);`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -738,7 +738,6 @@ int bap_usb_init(void)`
`738`	`738`	`*/`
`739`	`739`	`err = nrfx_clock_divider_set(NRF_CLOCK_DOMAIN_HFCLK, NRF_CLOCK_HFCLK_DIV_1);`
`740`	`740`
`741`		`- err -= NRFX_ERROR_BASE_NUM;`
`742`	`741`	`if (err != 0) {`
`743`	`742`	`LOG_WRN("Failed to set 128 MHz: %d", err);`
`744`	`743`	`}`