diff --git a/riscv-rt/CHANGELOG.md b/riscv-rt/CHANGELOG.md
index 56191077..863f2823 100644
--- a/riscv-rt/CHANGELOG.md
+++ b/riscv-rt/CHANGELOG.md
@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Main function no longer needs to be close to _start. A linker script may copy
   all code to RAM and keep .init in flash/ROM.
 
+### Fixed
+
+- `clippy` fixes
+
 ## [v0.15.0] - 2025-06-10
 
 ### Added
diff --git a/riscv-rt/macros/src/lib.rs b/riscv-rt/macros/src/lib.rs
index d0fbbaf7..dc38e997 100644
--- a/riscv-rt/macros/src/lib.rs
+++ b/riscv-rt/macros/src/lib.rs
@@ -88,16 +88,22 @@ pub fn entry(args: TokenStream, input: TokenStream) -> TokenStream {
         };
     }
     #[cfg(feature = "u-boot")]
-    if let Some(argument) = f.sig.inputs.get(0) {
-        if let Some(message) = check_argument_type(argument, "c_int") {
-            return message;
-        }
+    if let Some(message) = f
+        .sig
+        .inputs
+        .get(0)
+        .and_then(|argument| check_argument_type(argument, "c_int"))
+    {
+        return message;
     }
     #[cfg(feature = "u-boot")]
-    if let Some(argument) = f.sig.inputs.get(1) {
-        if let Some(message) = check_argument_type(argument, "*const *const c_char") {
-            return message;
-        }
+    if let Some(message) = f
+        .sig
+        .inputs
+        .get(1)
+        .and_then(|argument| check_argument_type(argument, "*const *const c_char"))
+    {
+        return message;
     }
 
     // check the function signature