2 files changed, 1 insertions, 10 deletions
diff --git a/util/flashrom_tester/src/main.rs b/util/flashrom_tester/src/main.rs
index 129d1a9b..44429ba8 100644
--- a/util/flashrom_tester/src/main.rs
+++ b/util/flashrom_tester/src/main.rs
@@ -83,7 +83,7 @@ fn main() {
         .arg(
             Arg::with_name("ccd_target_type")
                 .required(true)
-                .possible_values(&["host", "ec", "servo"]),
+                .possible_values(&["host"]),
         )
         .arg(
             Arg::with_name("print-layout")
diff --git a/util/flashrom_tester/src/tester.rs b/util/flashrom_tester/src/tester.rs
index 1fa44a84..4629c2eb 100644
--- a/util/flashrom_tester/src/tester.rs
+++ b/util/flashrom_tester/src/tester.rs
@@ -96,19 +96,10 @@ impl<'a> TestEnv<'a> {
     }
 
     pub fn run_test<T: TestCase>(&mut self, test: T) -> TestResult {
-        let use_dut_control = self.chip_type == FlashChip::SERVO;
-        if use_dut_control && flashrom::dut_ctrl_toggle_wp(false).is_err() {
-            error!("failed to dispatch dut_ctrl_toggle_wp()!");
-        }
-
         let name = test.get_name();
         info!("Beginning test: {}", name);
         let out = test.run(self);
         info!("Completed test: {}; result {:?}", name, out);
-
-        if use_dut_control && flashrom::dut_ctrl_toggle_wp(true).is_err() {
-            error!("failed to dispatch dut_ctrl_toggle_wp()!");
-        }
         out
     }