Consider unsafe fn as unsafe block

esp-rs · Apr 23, 2024 · 3ff7508 · 3ff7508
1 parent 9d4b9de
commit 3ff7508
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 25 deletions.
diff --git a/esp-hal/src/dma/mod.rs b/esp-hal/src/dma/mod.rs
@@ -695,10 +695,8 @@ where
         self.last_seen_handled_descriptor_ptr = core::ptr::null_mut();
         self.read_buffer_start = data;
 
-        unsafe {
-            self.rx_impl
-                .prepare_transfer_without_start(self.descriptors, circular, peri, data, len)
-        }
+        self.rx_impl
+            .prepare_transfer_without_start(self.descriptors, circular, peri, data, len)
     }
 
     fn start_transfer(&mut self) -> Result<(), DmaError> {

diff --git a/esp-hal/src/spi/master.rs b/esp-hal/src/spi/master.rs
@@ -1890,15 +1890,13 @@ where
             write_buffer_len,
         )
         .and_then(|_| tx.start_transfer())?;
-        unsafe {
-            rx.prepare_transfer_without_start(
-                false,
-                self.dma_peripheral(),
-                read_buffer_ptr,
-                read_buffer_len,
-            )
-            .and_then(|_| rx.start_transfer())?;
-        }
+        rx.prepare_transfer_without_start(
+            false,
+            self.dma_peripheral(),
+            read_buffer_ptr,
+            read_buffer_len,
+        )
+        .and_then(|_| rx.start_transfer())?;
 
         self.clear_dma_interrupts();
         reset_dma_before_usr_cmd(reg_block);
@@ -1967,10 +1965,8 @@ where
         self.update();
 
         reset_dma_before_load_dma_dscr(reg_block);
-        unsafe {
-            rx.prepare_transfer_without_start(false, self.dma_peripheral(), ptr, len)
-                .and_then(|_| rx.start_transfer())?;
-        }
+        rx.prepare_transfer_without_start(false, self.dma_peripheral(), ptr, len)
+            .and_then(|_| rx.start_transfer())?;
 
         self.clear_dma_interrupts();
         reset_dma_before_usr_cmd(reg_block);

diff --git a/esp-hal/src/spi/slave.rs b/esp-hal/src/spi/slave.rs
@@ -536,14 +536,12 @@ where
             write_buffer_ptr,
             write_buffer_len,
         )?;
-        unsafe {
-            rx.prepare_transfer_without_start(
-                false,
-                self.dma_peripheral(),
-                read_buffer_ptr,
-                read_buffer_len,
-            )?;
-        }
+        rx.prepare_transfer_without_start(
+            false,
+            self.dma_peripheral(),
+            read_buffer_ptr,
+            read_buffer_len,
+        )?;
 
         self.clear_dma_interrupts();
         reset_dma_before_usr_cmd(reg_block);