[nrf fromlist] drivers: clock_control: nrf: hfxo: Remove redundad code

ppryga-nordic · ppryga-nordic · commit dfd1b3d35c85 · 2024-12-17T07:20:13.000+01:00
There were redundant code in full_irq_lock(), full_irq_unlock()
functions that supposed to be used when ZLI IRQs are disabled.
These functions are compiled in only when CONFIG_ZERO_LATENCY_IRQS
is set, hence the non-ZLI execution path was never included
in final binaries.

Upstream PR #: 82995

Signed-off-by: Piotr Pryga &lt;piotr.pryga@nordicsemi.no&gt;
diff --git a/drivers/clock_control/clock_control_nrf2_hfxo.c b/drivers/clock_control/clock_control_nrf2_hfxo.c
@@ -37,23 +37,15 @@ static uint32_t full_irq_lock(void)
 {
 	uint32_t mcu_critical_state;
 
-	if (IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)) {
-		mcu_critical_state = __get_PRIMASK();
-		__disable_irq();
-	} else {
-		mcu_critical_state = irq_lock();
-	}
+	mcu_critical_state = __get_PRIMASK();
+	__disable_irq();
 
 	return mcu_critical_state;
 }
 
 static void full_irq_unlock(uint32_t mcu_critical_state)
 {
-	if (IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)) {
-		__set_PRIMASK(mcu_critical_state);
-	} else {
-		irq_unlock(mcu_critical_state);
-	}
+	__set_PRIMASK(mcu_critical_state);
 }
 #endif /* CONFIG_ZERO_LATENCY_IRQS */
 

Original file line number	Diff line number	Diff line change
`@@ -37,23 +37,15 @@ static uint32_t full_irq_lock(void)`
`37`	`37`	`{`
`38`	`38`	`uint32_t mcu_critical_state;`
`39`	`39`
`40`		`- if (IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)) {`
`41`		`- mcu_critical_state = __get_PRIMASK();`
`42`		`- __disable_irq();`
`43`		`- } else {`
`44`		`- mcu_critical_state = irq_lock();`
`45`		`- }`
	`40`	`+ mcu_critical_state = __get_PRIMASK();`
	`41`	`+ __disable_irq();`
`46`	`42`
`47`	`43`	`return mcu_critical_state;`
`48`	`44`	`}`
`49`	`45`
`50`	`46`	`static void full_irq_unlock(uint32_t mcu_critical_state)`
`51`	`47`	`{`
`52`		`- if (IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)) {`
`53`		`- __set_PRIMASK(mcu_critical_state);`
`54`		`- } else {`
`55`		`- irq_unlock(mcu_critical_state);`
`56`		`- }`
	`48`	`+ __set_PRIMASK(mcu_critical_state);`
`57`	`49`	`}`
`58`	`50`	`#endif /* CONFIG_ZERO_LATENCY_IRQS */`
`59`	`51`