File tree Expand file tree Collapse file tree 4 files changed +7
-6
lines changed Expand file tree Collapse file tree 4 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -94,6 +94,7 @@ implicit_clone = "warn"
94
94
inconsistent_struct_constructor = " warn"
95
95
manual_assert = " warn"
96
96
manual_let_else = " warn"
97
+ match_same_arms = " warn"
97
98
match_wildcard_for_single_variants = " warn"
98
99
ptr_as_ptr = " warn"
99
100
ptr_cast_constness = " warn"
Original file line number Diff line number Diff line change @@ -145,8 +145,9 @@ pub fn init_drivers() {
145
145
146
146
// TODO: Determine correct context via devicetree and allow more than one context
147
147
match PLATFORM_MODEL {
148
- Model :: Virt => init_plic ( plic_region. starting_address as usize , 1 ) ,
149
- Model :: Unknown => init_plic ( plic_region. starting_address as usize , 1 ) ,
148
+ Model :: Virt | Model :: Unknown => {
149
+ init_plic ( plic_region. starting_address as usize , 1 ) ;
150
+ }
150
151
Model :: Fux40 => init_plic ( plic_region. starting_address as usize , 2 ) ,
151
152
}
152
153
}
Original file line number Diff line number Diff line change @@ -88,8 +88,8 @@ pub fn is_uhyve_with_pci() -> bool {
88
88
89
89
pub fn args ( ) -> Option < & ' static str > {
90
90
match env:: boot_info ( ) . platform_info {
91
- PlatformInfo :: Multiboot { command_line, .. } => command_line ,
92
- PlatformInfo :: LinuxBootParams { command_line, .. } => command_line,
91
+ PlatformInfo :: Multiboot { command_line, .. }
92
+ | PlatformInfo :: LinuxBootParams { command_line, .. } => command_line,
93
93
_ => None ,
94
94
}
95
95
}
Original file line number Diff line number Diff line change @@ -673,8 +673,7 @@ pub fn init_device(
673
673
warn ! { "No PHY address provided. Trying to find PHY ..." }
674
674
for i in 0 ..32 {
675
675
match phy_read ( gem, i, PhyReg :: Control ) {
676
- 0xffff => ( ) , //Invalid
677
- 0x0 => ( ) , //Invalid
676
+ 0xffff | 0x0 => ( ) , //Invalid
678
677
_ => {
679
678
phy_addr = i;
680
679
warn ! ( "PHY found with address {phy_addr}" ) ;
You can’t perform that action at this time.
0 commit comments