From c7ff0ceb210d44dc3807ce2f635ce5deb53df787 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Fri, 6 Aug 2021 11:32:52 +0800 Subject: [PATCH] kernel: mem: fix remaining clippy lints Signed-off-by: Sean Cross --- kernel/src/mem.rs | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/kernel/src/mem.rs b/kernel/src/mem.rs index adf6dd557..08605618f 100644 --- a/kernel/src/mem.rs +++ b/kernel/src/mem.rs @@ -28,7 +28,7 @@ impl fmt::Display for MemoryRangeExtra { write!( f, "{}{}{}{} - ({:08x}) {:08x} - {:08x} {} bytes", - ((self.mem_tag >> 0) & 0xff) as u8 as char, + ((self.mem_tag) & 0xff) as u8 as char, ((self.mem_tag >> 8) & 0xff) as u8 as char, ((self.mem_tag >> 16) & 0xff) as u8 as char, ((self.mem_tag >> 24) & 0xff) as u8 as char, @@ -413,7 +413,7 @@ impl MemoryManager { // FIXME: Un-reserve addresses if we encounter an error here mm.reserve_address(self, virt, flags)?; } - Ok(unsafe { xous_kernel::MemoryRange::new(virt_ptr as usize, size) }?) + unsafe { xous_kernel::MemoryRange::new(virt_ptr as usize, size) } } /// Attempt to allocate a single page from the default section. @@ -517,7 +517,7 @@ impl MemoryManager { } } - Ok(unsafe { MemoryRange::new(virt as usize, size) }?) + unsafe { MemoryRange::new(virt as usize, size) } } /// Attempt to map the given physical address into the virtual address space @@ -547,10 +547,10 @@ impl MemoryManager { let phys_addr = crate::arch::mem::virt_to_phys(src_addr as usize)?; crate::arch::mem::move_page_inner( self, - &src_mapping, + src_mapping, src_addr, dest_pid, - &dest_mapping, + dest_mapping, dest_addr, )?; self.claim_release_move( @@ -579,10 +579,10 @@ impl MemoryManager { // the page while it's borrowed. crate::arch::mem::lend_page_inner( self, - &src_mapping, + src_mapping, src_addr as _, dest_pid, - &dest_mapping, + dest_mapping, dest_addr as _, mutable, ) @@ -603,10 +603,10 @@ impl MemoryManager { // the page while it's borrowed. crate::arch::mem::return_page_inner( self, - &src_mapping, + src_mapping, src_addr, dest_pid, - &dest_mapping, + dest_mapping, dest_addr, ) } @@ -674,10 +674,8 @@ impl MemoryManager { let addr = addr as usize; // Ensure the address lies on a page boundary - if cfg!(baremetal) { - if addr & 0xfff != 0 { - return Err(xous_kernel::Error::BadAlignment); - } + if cfg!(baremetal) && addr & 0xfff != 0 { + return Err(xous_kernel::Error::BadAlignment); } let mut offset = 0;