Drop superfluous exit_conf_mode*() calls, we don't want to call them twice.

Small cosmetic fixes (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2956 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

6 files changed, 0 insertions, 8 deletions

diff --git a/util/superiotool/ali.c b/util/superiotool/ali.c
index e781aba827..56e086f7fa 100644
--- a/util/superiotool/ali.c
+++ b/util/superiotool/ali.c
@@ -95,4 +95,3 @@ void probe_idregs_ali(uint16_t port)
 
 	exit_conf_mode_ali(port);
 }
-
diff --git a/util/superiotool/fintek.c b/util/superiotool/fintek.c
index ab9b2d5b2b..e1ff0f44f7 100644
--- a/util/superiotool/fintek.c
+++ b/util/superiotool/fintek.c
@@ -99,4 +99,3 @@ void probe_idregs_fintek(uint16_t port)
 
 	exit_conf_mode_winbond_fintek_ite_8787(port);
 }
-
diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c
index 47bf29fbe8..dce80cb409 100644
--- a/util/superiotool/ite.c
+++ b/util/superiotool/ite.c
@@ -360,7 +360,6 @@ static void probe_idregs_ite_helper(const char *init, uint16_t port)
 	if (superio_unknown(reg_table, id)) {
 		if (verbose)
 			printf(NOTFOUND "id=0x%04x, rev=0x%01x\n", id, chipver);
-		exit_conf_mode_ite(port);
 		return;
 	}
 
@@ -381,4 +380,3 @@ void probe_idregs_ite(uint16_t port)
 	probe_idregs_ite_helper("(init=0x87,0x87) ", port);
 	exit_conf_mode_winbond_fintek_ite_8787(port);
 }
-
diff --git a/util/superiotool/nsc.c b/util/superiotool/nsc.c
index 5cb0ec7fa5..121814c7f7 100644
--- a/util/superiotool/nsc.c
+++ b/util/superiotool/nsc.c
@@ -170,4 +170,3 @@ void probe_idregs_nsc(uint16_t port)
 
 	dump_superio("NSC", reg_table, port, id);
 }
-
diff --git a/util/superiotool/smsc.c b/util/superiotool/smsc.c
index 2a5487407d..0b7b7fba7e 100644
--- a/util/superiotool/smsc.c
+++ b/util/superiotool/smsc.c
@@ -390,4 +390,3 @@ void probe_idregs_smsc(uint16_t port)
 	probe_idregs_smsc_helper(port, DEVICE_ID_REG, DEVICE_REV_REG);
 	probe_idregs_smsc_helper(port, DEVICE_ID_REG_OLD, DEVICE_REV_REG_OLD);
 }
-
diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c
index 671a825684..f473e2dd7a 100644
--- a/util/superiotool/winbond.c
+++ b/util/superiotool/winbond.c
@@ -414,7 +414,6 @@ void probe_idregs_winbond_helper(const char *init, uint16_t port)
 		if (verbose)
 			printf(NOTFOUND "id/oldid=0x%02x/0x%02x, rev=0x%02x\n",
 			       devid, olddevid, rev);
-		exit_conf_mode_winbond_fintek_ite_8787(port);
 		return;
 	}
 
@@ -450,4 +449,3 @@ void probe_idregs_winbond(uint16_t port)
 	probe_idregs_winbond_helper("(init=0x87,0x87) ", port);
 	exit_conf_mode_winbond_fintek_ite_8787(port);
 }
-