diff --git a/drivers/android/binder/freeze.rs b/drivers/android/binder/freeze.rs index ea2450f3f16f..38faa8c63af9 100644 --- a/drivers/android/binder/freeze.rs +++ b/drivers/android/binder/freeze.rs @@ -75,10 +75,8 @@ fn new(flags: kernel::alloc::Flags) -> Result { } fn init(ua: UninitFM, cookie: FreezeCookie, pid: i32) -> DLArc { - match ua.pin_init_with(DTRWrap::new(FreezeMessage { cookie, pid })) { - Ok(msg) => ListArc::from(msg), - Err(err) => match err {}, - } + let Ok(msg) = ua.pin_init_with(DTRWrap::new(FreezeMessage { cookie, pid })); + ListArc::from(msg) } } diff --git a/drivers/android/binder/node/wrapper.rs b/drivers/android/binder/node/wrapper.rs index 828a331f5d99..02085beb6fab 100644 --- a/drivers/android/binder/node/wrapper.rs +++ b/drivers/android/binder/node/wrapper.rs @@ -20,10 +20,8 @@ pub(crate) fn new() -> Result { } pub(super) fn init(self, node: DArc) -> DLArc { - match self.inner.pin_init_with(DTRWrap::new(NodeWrapper { node })) { - Ok(initialized) => ListArc::from(initialized) as DLArc, - Err(err) => match err {}, - } + let Ok(initialized) = self.inner.pin_init_with(DTRWrap::new(NodeWrapper { node })); + ListArc::from(initialized) as DLArc } } diff --git a/drivers/android/binder/process.rs b/drivers/android/binder/process.rs index 58c84be8ab77..a56489d8bfcc 100644 --- a/drivers/android/binder/process.rs +++ b/drivers/android/binder/process.rs @@ -900,11 +900,8 @@ pub(crate) fn insert_or_update_handle( let (info_proc, info_node) = { let info_init = NodeRefInfo::new(node_ref, handle, self.into()); - match info.pin_init_with(info_init) { - Ok(info) => ListArc::pair_from_pin_unique(info), - // error is infallible - Err(err) => match err {}, - } + let Ok(info) = info.pin_init_with(info_init); + ListArc::pair_from_pin_unique(info) }; // Ensure the process is still alive while we insert a new reference. @@ -1301,14 +1298,8 @@ pub(crate) fn request_death( return Ok(()); } - let death = { - let death_init = NodeDeath::new(info.node_ref().node.clone(), self.clone(), cookie); - match death.pin_init_with(death_init) { - Ok(death) => death, - // error is infallible - Err(err) => match err {}, - } - }; + let death_init = NodeDeath::new(info.node_ref().node.clone(), self.clone(), cookie); + let Ok(death) = death.pin_init_with(death_init); // Register the death notification. {