From 1689c7b5de7fed38cc52884433eda00622e02f3f Mon Sep 17 00:00:00 2001
From: Greg KH <greg@kroah.com>
Date: Thu, 22 Sep 2005 22:23:32 +0200
Subject: [PATCH] --- yaml --- r: 10611 b: refs/heads/master c:
 ca68f1193e8fc86470d4222d563d13b5584dc4f8 h: refs/heads/master i:   10609:
 aed4b1941f29715538e3b783f9324972ba517cf4   10607:
 20ebbc7c2a28015b7e17635770f1b25cfff973fc v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/i2c/busses/i2c-viapro.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index fc54fda711fd..70f67a78db27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed5453e54f0c4a29605fd8399f58649d8739f5f0
+refs/heads/master: ca68f1193e8fc86470d4222d563d13b5584dc4f8
diff --git a/trunk/drivers/i2c/busses/i2c-viapro.c b/trunk/drivers/i2c/busses/i2c-viapro.c
index c1c9eb1d714f..566342d50c5f 100644
--- a/trunk/drivers/i2c/busses/i2c-viapro.c
+++ b/trunk/drivers/i2c/busses/i2c-viapro.c
@@ -126,6 +126,8 @@ static void vt596_dump_regs(const char *msg, u8 size)
 		printk("%02x\n", inb_p(SMBBLKDAT));
 	}
 }
+#else
+static inline void vt596_dump_regs(const char *msg, u8 size) { }
 #endif
 
 /* Return -1 on error, 0 on success */
@@ -135,9 +137,7 @@ static int vt596_transaction(u8 size)
 	int result = 0;
 	int timeout = 0;
 
-#ifdef DEBUG
 	vt596_dump_regs("Transaction (pre)", size);
-#endif
 
 	/* Make sure the SMBus host is ready to start transmitting */
 	if ((temp = inb_p(SMBHSTSTS)) & 0x1F) {
@@ -192,9 +192,7 @@ static int vt596_transaction(u8 size)
 	if (temp & 0x1F)
 		outb_p(temp, SMBHSTSTS);
 
-#ifdef DEBUG
 	vt596_dump_regs("Transaction (post)", size);
-#endif
 
 	return result;
 }