Changeset 3164

Show
Ignore:
Timestamp:
10/31/05 12:53:26 (3 years ago)
Author:
khali
Message:

Sync with Linux 2.6:
* Adjust log messages on SMBus reset.
* Reformat comment.
* Change the module author string.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • lm-sensors/trunk/kernel/busses/i2c-viapro.c

    r3150 r3164  
    145145                outb_p(temp, SMBHSTSTS); 
    146146                if ((temp = inb_p(SMBHSTSTS)) & 0x1F) { 
    147                         dev_dbg(&vt596_adapter, "Failed! (0x%02x)\n", temp); 
     147                        dev_err(&vt596_adapter, "SMBus reset failed! " 
     148                                "(0x%02x)\n", temp); 
    148149                        return -1; 
    149                 } else { 
    150                         dev_dbg(&vt596_adapter, "Successful!\n"); 
    151150                } 
    152151        } 
    …… 
    181180                result = -1; 
    182181                /* The quick and receive byte commands are used to probe 
    183                    for chips, so errors are expected, and we don't 
    184                    want to frighten the user. */ 
     182                   for chips, so errors are expected, and we don't want 
     183                   to frighten the user. */ 
    185184                if (!((size == VT596_QUICK && !read) || 
    186185                      (size == VT596_BYTE && read))) 
    …… 
    516515} 
    517516 
    518 MODULE_AUTHOR( 
    519     "Frodo Looijaard <frodol@dds.nl> and " 
    520     "Philip Edelbrock <phil@netroedge.com>"); 
     517MODULE_AUTHOR("Kyosti Malkki <kmalkki@cc.hut.fi>, " 
     518             "Mark D. Studebaker <mdsxyz123@yahoo.com> and " 
     519             "Jean Delvare <khali@linux-fr.org>"); 
    521520MODULE_DESCRIPTION("vt82c596 SMBus driver"); 
    522521MODULE_LICENSE("GPL");