[nrf fromlist] soc: nordic: s2ram: Optimize s2am marking functions

adamkondraciuk · adamkondraciuk · commit d0331fefa63f · 2025-03-20T15:20:03.000+01:00
Optimize `pm_s2ram_mark_check_and_clear()` function.

Upstream PR #: 87304

Signed-off-by: Adam Kondraciuk &lt;adam.kondraciuk@nordicsemi.no&gt;
diff --git a/soc/nordic/nrf54h/pm_s2ram.c b/soc/nordic/nrf54h/pm_s2ram.c
@@ -184,18 +184,16 @@ void pm_s2ram_mark_set(void)
 
 bool pm_s2ram_mark_check_and_clear(void)
 {
-	bool unretained_wake;
 	bool restore_valid;
 	uint32_t reset_reason = nrf_resetinfo_resetreas_local_get(NRF_RESETINFO);
 
 	if (reset_reason != NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK) {
 		return false;
 	}
-	unretained_wake = reset_reason & NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK;
 	nrf_resetinfo_resetreas_local_set(NRF_RESETINFO, 0);
 
 	restore_valid = nrf_resetinfo_restore_valid_check(NRF_RESETINFO);
 	nrf_resetinfo_restore_valid_set(NRF_RESETINFO, false);
 
-	return (unretained_wake & restore_valid) ? true : false;
+	return restore_valid ? true : false;
 }

Original file line number	Diff line number	Diff line change
`@@ -184,18 +184,16 @@ void pm_s2ram_mark_set(void)`
`184`	`184`
`185`	`185`	`bool pm_s2ram_mark_check_and_clear(void)`
`186`	`186`	`{`
`187`		`- bool unretained_wake;`
`188`	`187`	`bool restore_valid;`
`189`	`188`	`uint32_t reset_reason = nrf_resetinfo_resetreas_local_get(NRF_RESETINFO);`
`190`	`189`
`191`	`190`	`if (reset_reason != NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK) {`
`192`	`191`	`return false;`
`193`	`192`	`}`
`194`		`- unretained_wake = reset_reason & NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK;`
`195`	`193`	`nrf_resetinfo_resetreas_local_set(NRF_RESETINFO, 0);`
`196`	`194`
`197`	`195`	`restore_valid = nrf_resetinfo_restore_valid_check(NRF_RESETINFO);`
`198`	`196`	`nrf_resetinfo_restore_valid_set(NRF_RESETINFO, false);`
`199`	`197`
`200`		`- return (unretained_wake & restore_valid) ? true : false;`
	`198`	`+ return restore_valid ? true : false;`
`201`	`199`	`}`