devices: bat: remove unneeded use of Descriptor

WaitContext::build_with expects an array of &dyn AsRawDescriptor, which
the events we pass to it all implement. There is no need to use a
temporary Descriptor here.

BUG=233968702
TEST=cargo build

Change-Id: Ie39e1683ed13e474ef43bdad9375d60c6bf55f5a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3670104
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Michael Hoyle <mikehoyle@google.com>
Commit-Queue: Alexandre Courbot <acourbot@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Alexandre Courbot 2022-05-25 16:52:44 +09:00 committed by Chromeos LUCI
parent c9a294ced7
commit 756c0bea9b

View file

@ -141,12 +141,9 @@ fn command_monitor(
create_power_monitor: Option<Box<dyn CreatePowerMonitorFn>>, create_power_monitor: Option<Box<dyn CreatePowerMonitorFn>>,
) { ) {
let wait_ctx: WaitContext<Token> = match WaitContext::build_with(&[ let wait_ctx: WaitContext<Token> = match WaitContext::build_with(&[
(&Descriptor(tube.as_raw_descriptor()), Token::Commands), (&tube, Token::Commands),
( (irq_evt.get_resample(), Token::Resample),
&Descriptor(irq_evt.get_resample().as_raw_descriptor()), (&kill_evt, Token::Kill),
Token::Resample,
),
(&Descriptor(kill_evt.as_raw_descriptor()), Token::Kill),
]) { ]) {
Ok(pc) => pc, Ok(pc) => pc,
Err(e) => { Err(e) => {