diff --git a/drivers/android/binder/process.rs b/drivers/android/binder/process.rs index 8ae013580494..3cfef886af10 100644 --- a/drivers/android/binder/process.rs +++ b/drivers/android/binder/process.rs @@ -1633,7 +1633,7 @@ impl Process { pub(crate) fn poll( this: ArcBorrow<'_, Process>, file: &File, - table: &mut PollTable, + table: PollTable<'_>, ) -> Result { let thread = this.get_current_thread()?; let (from_proc, mut mask) = thread.poll(file, table); diff --git a/drivers/android/binder/rust_binder.rs b/drivers/android/binder/rust_binder.rs index c51412869a8b..05bd98b3a108 100644 --- a/drivers/android/binder/rust_binder.rs +++ b/drivers/android/binder/rust_binder.rs @@ -472,7 +472,7 @@ unsafe extern "C" fn rust_binder_poll( // SAFETY: The caller ensures that the file is valid. let fileref = unsafe { File::from_raw_file(file) }; // SAFETY: The caller ensures that the `PollTable` is valid. - match Process::poll(f, fileref, unsafe { PollTable::from_ptr(wait) }) { + match Process::poll(f, fileref, unsafe { PollTable::from_raw(wait) }) { Ok(v) => v, Err(_) => bindings::POLLERR, } diff --git a/drivers/android/binder/thread.rs b/drivers/android/binder/thread.rs index 4f62377d968b..5352f5deaac8 100644 --- a/drivers/android/binder/thread.rs +++ b/drivers/android/binder/thread.rs @@ -1614,7 +1614,7 @@ impl Thread { ret } - pub(crate) fn poll(&self, file: &File, table: &mut PollTable) -> (bool, u32) { + pub(crate) fn poll(&self, file: &File, table: PollTable<'_>) -> (bool, u32) { table.register_wait(file, &self.work_condvar); let mut inner = self.inner.lock(); (inner.should_use_process_work_queue(), inner.poll())