From 6e325ba099ad472026f6abc42c3dbc637ba8e0df Mon Sep 17 00:00:00 2001
From: Jan Niehusmann <jan@gondor.com>
Date: Thu, 28 Jul 2022 02:26:24 +0200
Subject: [PATCH] Remove unnecessary cortex_m::interrupt::free in timer.rs
 (#402)

The only thing accessed by those methods is `&mut self`, which is
guaranteed to be a unique reference. So an interrupt can not
interfere with the correctness of the operation.
---
 rp2040-hal/src/timer.rs | 56 ++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/rp2040-hal/src/timer.rs b/rp2040-hal/src/timer.rs
index a19cd2c..5011cbd 100644
--- a/rp2040-hal/src/timer.rs
+++ b/rp2040-hal/src/timer.rs
@@ -60,50 +60,42 @@ impl Timer {
 
     /// Retrieve a reference to alarm 0. Will only return a value the first time this is called
     pub fn alarm_0(&mut self) -> Option<Alarm0> {
-        cortex_m::interrupt::free(|_| {
-            if self.alarms[0] {
-                self.alarms[0] = false;
-                Some(Alarm0(PhantomData))
-            } else {
-                None
-            }
-        })
+        if self.alarms[0] {
+            self.alarms[0] = false;
+            Some(Alarm0(PhantomData))
+        } else {
+            None
+        }
     }
 
     /// Retrieve a reference to alarm 1. Will only return a value the first time this is called
     pub fn alarm_1(&mut self) -> Option<Alarm1> {
-        cortex_m::interrupt::free(|_| {
-            if self.alarms[1] {
-                self.alarms[1] = false;
-                Some(Alarm1(PhantomData))
-            } else {
-                None
-            }
-        })
+        if self.alarms[1] {
+            self.alarms[1] = false;
+            Some(Alarm1(PhantomData))
+        } else {
+            None
+        }
     }
 
     /// Retrieve a reference to alarm 2. Will only return a value the first time this is called
     pub fn alarm_2(&mut self) -> Option<Alarm2> {
-        cortex_m::interrupt::free(|_| {
-            if self.alarms[2] {
-                self.alarms[2] = false;
-                Some(Alarm2(PhantomData))
-            } else {
-                None
-            }
-        })
+        if self.alarms[2] {
+            self.alarms[2] = false;
+            Some(Alarm2(PhantomData))
+        } else {
+            None
+        }
     }
 
     /// Retrieve a reference to alarm 3. Will only return a value the first time this is called
     pub fn alarm_3(&mut self) -> Option<Alarm3> {
-        cortex_m::interrupt::free(|_| {
-            if self.alarms[3] {
-                self.alarms[3] = false;
-                Some(Alarm3(PhantomData))
-            } else {
-                None
-            }
-        })
+        if self.alarms[3] {
+            self.alarms[3] = false;
+            Some(Alarm3(PhantomData))
+        } else {
+            None
+        }
     }
 }