[PATCH 4/9] rust: dma: simplify try_dma_read! and try_dma_write!

[Eliot Courtney]

Remove unnecessary branch and unify branch order.

Signed-off-by: Eliot Courtney <ecourt...@nvidia.com>
---
 rust/kernel/dma.rs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/rust/kernel/dma.rs b/rust/kernel/dma.rs
index 43ed0dfdbc08..03fc001eb983 100644
--- a/rust/kernel/dma.rs
+++ b/rust/kernel/dma.rs
@@ -875,9 +875,6 @@ macro_rules! try_dma_read {
             }
         })()
     }};
-    ($dma:ident [ $idx:expr ] $($field:tt)* ) => {
-        $crate::try_dma_read!($dma, $idx, $($field)*)
-    };
     ($($dma:ident).* [ $idx:expr ] $($field:tt)* ) => {
         $crate::try_dma_read!($($dma).*, $idx, $($field)*)
     };
@@ -905,13 +902,7 @@ macro_rules! try_dma_read {
 /// ```
 #[macro_export]
 macro_rules! try_dma_write {
-    ($dma:ident [ $idx:expr ] $($field:tt)*) => {{
-        $crate::try_dma_write!($dma, $idx, $($field)*)
-    }};
-    ($($dma:ident).* [ $idx:expr ] $($field:tt)* ) => {{
-        $crate::try_dma_write!($($dma).*, $idx, $($field)*)
-    }};
-    ($dma:expr, $idx: expr, = $val:expr) => {
+    ($dma:expr, $idx:expr, = $val:expr) => {
         (|| -> ::core::result::Result<_, $crate::error::Error> {
             let item = 
$crate::dma::CoherentAllocation::try_item_from_index(&$dma, $idx)?;
             // SAFETY: `try_item_from_index` ensures that `item` is always a 
valid item.
@@ -919,7 +910,7 @@ macro_rules! try_dma_write {
             ::core::result::Result::Ok(())
         })()
     };
-    ($dma:expr, $idx: expr, $(.$field:ident)* = $val:expr) => {
+    ($dma:expr, $idx:expr, $(.$field:ident)* = $val:expr) => {
         (|| -> ::core::result::Result<_, $crate::error::Error> {
             let item = 
$crate::dma::CoherentAllocation::try_item_from_index(&$dma, $idx)?;
             // SAFETY: `try_item_from_index` ensures that `item` is always a 
valid pointer
@@ -932,4 +923,7 @@ macro_rules! try_dma_write {
             ::core::result::Result::Ok(())
         })()
     };
+    ($($dma:ident).* [ $idx:expr ] $($field:tt)* ) => {{
+        $crate::try_dma_write!($($dma).*, $idx, $($field)*)
+    }};
 }

-- 
2.52.0