From dadc0c6c10581bace76795fdc61e35d9b558b60f Mon Sep 17 00:00:00 2001
From: Wren Turkal <wt@penguintechs.org>
Date: Sat, 1 Aug 2020 12:48:06 -0700
Subject: [PATCH 1/2] Remove unused imports.

Signed-off-by: Wren Turkal <wt@penguintechs.org>
---
 pcid/src/driver_interface/mod.rs | 2 +-
 pcid/src/main.rs                 | 4 +---
 pcid/src/pci/bus.rs              | 2 +-
 pcid/src/pcie/mod.rs             | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pcid/src/driver_interface/mod.rs b/pcid/src/driver_interface/mod.rs
index 3716574c10..0b0a5c1009 100644
--- a/pcid/src/driver_interface/mod.rs
+++ b/pcid/src/driver_interface/mod.rs
@@ -1,4 +1,4 @@
-use std::fs::{File, OpenOptions};
+use std::fs::File;
 use std::io::prelude::*;
 use std::{env, io};
 
diff --git a/pcid/src/main.rs b/pcid/src/main.rs
index 527bcc0281..b66e9ea3fd 100644
--- a/pcid/src/main.rs
+++ b/pcid/src/main.rs
@@ -5,9 +5,7 @@ use std::io::prelude::*;
 use std::os::unix::io::{FromRawFd, RawFd};
 use std::process::Command;
 use std::sync::{Arc, Mutex};
-use std::{env, io, i64, thread};
-
-use syscall::iopl;
+use std::{i64, thread};
 
 use structopt::StructOpt;
 use log::{error, info, warn, trace};
diff --git a/pcid/src/pci/bus.rs b/pcid/src/pci/bus.rs
index 4c2a931f3f..0211c6d4ac 100644
--- a/pcid/src/pci/bus.rs
+++ b/pcid/src/pci/bus.rs
@@ -1,4 +1,4 @@
-use super::{Pci, PciDev, CfgAccess};
+use super::{PciDev, CfgAccess};
 
 pub struct PciBus<'pci> {
     pub pci: &'pci dyn CfgAccess,
diff --git a/pcid/src/pcie/mod.rs b/pcid/src/pcie/mod.rs
index 453aef8b0c..6536c954f8 100644
--- a/pcid/src/pcie/mod.rs
+++ b/pcid/src/pcie/mod.rs
@@ -3,7 +3,6 @@ use std::collections::BTreeMap;
 use std::sync::{Arc, Mutex};
 
 use syscall::flag::PhysmapFlags;
-use syscall::io::Dma;
 
 use smallvec::SmallVec;
 

From 6018b6fc491e41ac9ea3577b4b70384f950dfa4f Mon Sep 17 00:00:00 2001
From: Wren Turkal <wt@penguintechs.org>
Date: Sat, 1 Aug 2020 16:52:47 -0700
Subject: [PATCH 2/2] Fix lint issues from rustc.

Signed-off-by: Wren Turkal <wt@penguintechs.org>
---
 ahcid/src/scheme.rs  | 2 +-
 e1000d/src/device.rs | 2 +-
 pcid/src/pci/msi.rs  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ahcid/src/scheme.rs b/ahcid/src/scheme.rs
index 48d0721d61..5d5e13f85a 100644
--- a/ahcid/src/scheme.rs
+++ b/ahcid/src/scheme.rs
@@ -1,6 +1,6 @@
 use std::collections::BTreeMap;
 use std::{cmp, str};
-use std::convert::{TryFrom, TryInto};
+use std::convert::{TryFrom};
 use std::fmt::Write;
 use std::io::prelude::*;
 use std::io::SeekFrom;
diff --git a/e1000d/src/device.rs b/e1000d/src/device.rs
index bded679c9e..ef1c11cc8a 100644
--- a/e1000d/src/device.rs
+++ b/e1000d/src/device.rs
@@ -1,5 +1,5 @@
 use std::collections::BTreeMap;
-use std::{cmp, mem, ptr, slice, thread};
+use std::{cmp, mem, ptr, slice};
 
 use netutils::setcfg;
 use syscall::error::{Error, Result, EACCES, EBADF, EINVAL, EWOULDBLOCK};
diff --git a/pcid/src/pci/msi.rs b/pcid/src/pci/msi.rs
index 145f611533..c8256389f5 100644
--- a/pcid/src/pci/msi.rs
+++ b/pcid/src/pci/msi.rs
@@ -105,7 +105,7 @@ impl MsiCapability {
     }
     pub fn set_multi_message_enable(&mut self, log_mme: u8) {
         let mut new_message_control = self.message_control() & (!Self::MC_MULTI_MESSAGE_ENABLE_MASK);
-        new_message_control |= (u16::from(log_mme) << Self::MC_MULTI_MESSAGE_ENABLE_SHIFT);
+        new_message_control |= u16::from(log_mme) << Self::MC_MULTI_MESSAGE_ENABLE_SHIFT;
         self.set_message_control(new_message_control);
     }