From ee837eeb43f490f21f5d882ef592dc302ce7e03a Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 31 Oct 2005 11:53:26 +0000 Subject: [PATCH] Sync with Linux 2.6: * Adjust log messages on SMBus reset. * Reformat comment. * Change the module author string. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@3164 7894878c-1315-0410-8ee3-d5d059ff63e0 --- kernel/busses/i2c-viapro.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/kernel/busses/i2c-viapro.c b/kernel/busses/i2c-viapro.c index 037965d2..f911f1c7 100644 --- a/kernel/busses/i2c-viapro.c +++ b/kernel/busses/i2c-viapro.c @@ -144,10 +144,9 @@ static int vt596_transaction(u8 size) outb_p(temp, SMBHSTSTS); if ((temp = inb_p(SMBHSTSTS)) & 0x1F) { - dev_dbg(&vt596_adapter, "Failed! (0x%02x)\n", temp); + dev_err(&vt596_adapter, "SMBus reset failed! " + "(0x%02x)\n", temp); return -1; - } else { - dev_dbg(&vt596_adapter, "Successful!\n"); } } @@ -180,8 +179,8 @@ static int vt596_transaction(u8 size) int read = inb_p(SMBHSTADD) & 0x01; result = -1; /* The quick and receive byte commands are used to probe - for chips, so errors are expected, and we don't - want to frighten the user. */ + for chips, so errors are expected, and we don't want + to frighten the user. */ if (!((size == VT596_QUICK && !read) || (size == VT596_BYTE && read))) dev_err(&vt596_adapter, "Transaction error!\n"); @@ -515,9 +514,9 @@ static void __exit i2c_vt596_exit(void) release_region(vt596_smba, 8); } -MODULE_AUTHOR( - "Frodo Looijaard and " - "Philip Edelbrock "); +MODULE_AUTHOR("Kyosti Malkki , " + "Mark D. Studebaker and " + "Jean Delvare "); MODULE_DESCRIPTION("vt82c596 SMBus driver"); MODULE_LICENSE("GPL");