mirror of
https://chromium.googlesource.com/crosvm/crosvm
synced 2024-10-23 20:59:45 +00:00
devices/irqchip: deduplicate statements inside if
Pull the duplicated first statement out of the IRQ triggering sequences to placate clippy's new warning. BUG=b:197251702 TEST=bin/clippy # with rust-toolchain = 1.54.0 Change-Id: I8cd8577af35990522e198f97f3a666ad6730e31b Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3108614 Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Allen Webb <allenwebb@google.com> Reviewed-by: Colin Downs-Razouk <colindr@google.com>
This commit is contained in:
parent
35712b20d8
commit
63db2893e2
1 changed files with 6 additions and 12 deletions
|
@ -443,19 +443,15 @@ impl IrqChip for KvmSplitIrqChip {
|
|||
match chip {
|
||||
IrqSourceChip::PicPrimary | IrqSourceChip::PicSecondary => {
|
||||
let mut pic = self.pic.lock();
|
||||
if evt.resample_event.is_some() {
|
||||
pic.service_irq(pin as u8, true);
|
||||
} else {
|
||||
pic.service_irq(pin as u8, true);
|
||||
pic.service_irq(pin as u8, true);
|
||||
if evt.resample_event.is_none() {
|
||||
pic.service_irq(pin as u8, false);
|
||||
}
|
||||
}
|
||||
IrqSourceChip::Ioapic => {
|
||||
if let Ok(mut ioapic) = self.ioapic.try_lock() {
|
||||
if evt.resample_event.is_some() {
|
||||
ioapic.service_irq(pin as usize, true);
|
||||
} else {
|
||||
ioapic.service_irq(pin as usize, true);
|
||||
ioapic.service_irq(pin as usize, true);
|
||||
if evt.resample_event.is_none() {
|
||||
ioapic.service_irq(pin as usize, false);
|
||||
}
|
||||
} else {
|
||||
|
@ -622,10 +618,8 @@ impl IrqChip for KvmSplitIrqChip {
|
|||
.retain(|&event_index| {
|
||||
if let Some(evt) = &self.irq_events.lock()[event_index] {
|
||||
if let Ok(mut ioapic) = self.ioapic.try_lock() {
|
||||
if evt.resample_event.is_some() {
|
||||
ioapic.service_irq(evt.gsi as usize, true);
|
||||
} else {
|
||||
ioapic.service_irq(evt.gsi as usize, true);
|
||||
ioapic.service_irq(evt.gsi as usize, true);
|
||||
if evt.resample_event.is_none() {
|
||||
ioapic.service_irq(evt.gsi as usize, false);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue