Changeset 3140

Timestamp:

10/29/05 23:04:11 (8 years ago)

Author:

khali

Message:

Code cleanups, backported from Linux 2.6.

Files:

• lm-sensors/trunk/kernel/busses/i2c-viapro.c (modified) (22 diffs)

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

@@ -39 +39 @@
 #include <linux/kernel.h>
 #include <linux/stddef.h>
-#include <linux/sched.h>
 #include <linux/ioport.h>
 #include <linux/i2c.h>
@@ -54 +53 @@
 static unsigned short vt596_smba;
 #define SMBHSTSTS       (vt596_smba + 0)
-#define SMBHSLVSTS      (vt596_smba + 1)
 #define SMBHSTCNT       (vt596_smba + 2)
 #define SMBHSTCMD       (vt596_smba + 3)
@@ -61 +59 @@
 #define SMBHSTDAT1      (vt596_smba + 6)
 #define SMBBLKDAT       (vt596_smba + 7)
-#define SMBSLVCNT       (vt596_smba + 8)
-#define SMBSHDWCMD      (vt596_smba + 9)
-#define SMBSLVEVT       (vt596_smba + 0xA)
-#define SMBSLVDAT       (vt596_smba + 0xC)
 
 /* PCI Address Constants */
@@ -71 +65 @@
    We try to select the better one */
 
-static unsigned short smb_cf_hstcfg = 0xD2;
-
-#define SMBHSTCFG       (smb_cf_hstcfg)
-#define SMBSLVC         (smb_cf_hstcfg + 1)
-#define SMBSHDW1        (smb_cf_hstcfg + 2)
-#define SMBSHDW2        (smb_cf_hstcfg + 3)
-#define SMBREV          (smb_cf_hstcfg + 4)
+static unsigned short SMBHSTCFG = 0xD2;
 
 /* Other settings */
 #define MAX_TIMEOUT     500
-#define ENABLE_INT9     0
 
 /* VT82C596 constants */
@@ -107 +94 @@
 
 
+static struct pci_driver vt596_driver;
 static struct i2c_adapter vt596_adapter;
 
@@ -112 +100 @@
 static unsigned int vt596_features;
 
-/* Another internally used function */
+/* Return -1 on error, 0 on success */
 static int vt596_transaction(void)
 {
@@ -132 +120 @@
                 if ((temp = inb_p(SMBHSTSTS)) & 0x1F) {
                         dev_dbg(&vt596_adapter, "Failed! (0x%02x)\n", temp);
-
                         return -1;
                 } else {
-                        dev_dbg(&vt596_adapter, "Successfull!\n");
+                        dev_dbg(&vt596_adapter, "Successful!\n");
                 }
         }
 
-        /* start the transaction by setting bit 6 */
-        outb_p(inb(SMBHSTCNT) | 0x040, SMBHSTCNT);
-
-        /* We will always wait for a fraction of a second!
-           I don't know if VIA needs this, Intel did  */
+        /* Start the transaction by setting bit 6 */
+        outb_p(inb(SMBHSTCNT) | 0x40, SMBHSTCNT);
+
+        /* We will always wait for a fraction of a second */
         do {
                 i2c_delay(1);
@@ -152 +138 @@
         if (timeout >= MAX_TIMEOUT) {
                 result = -1;
-                dev_dbg(&vt596_adapter, "SMBus Timeout!\n");
+                dev_err(&vt596_adapter, "SMBus Timeout!\n");
         }
 
         if (temp & 0x10) {
                 result = -1;
-                dev_dbg(&vt596_adapter, "Error: Failed bus transaction\n");
+                dev_err(&vt596_adapter, "Transaction failed (0x%02x)\n",
+                        inb_p(SMBHSTCNT) & 0x3C);
         }
 
         if (temp & 0x08) {
                 result = -1;
-                dev_info(&vt596_adapter, "Bus collision! SMBus may be "
-                        "locked until next hard\nreset. (sorry!)\n");
-                /* Clock stops and slave is stuck in mid-transmission */
+                dev_err(&vt596_adapter, "SMBus collision!\n");
         }
 
         if (temp & 0x04) {
+                int size = inb_p(SMBHSTCNT) & 0x3C;
+                int read = inb_p(SMBHSTADD) & 0x01;
                 result = -1;
-                dev_dbg(&vt596_adapter, "Error: no response!\n");
-        }
-
-        if ((temp = inb_p(SMBHSTSTS)) & 0x1F) {
+                /* The quick and receive byte command are used to probe
+                   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");
+        }
+
+        /* Resetting status register */
+        if (temp & 0x1F)
                 outb_p(temp, SMBHSTSTS);
-                if ((temp = inb_p(SMBHSTSTS)) & 0x1F) {
-                        dev_warn(&vt596_adapter, "Failed reset at end "
-                                 "of transaction (%02x)\n", temp);
-                }
-        }
 
         dev_dbg(&vt596_adapter, "Transaction (post): CNT=%02x, CMD=%02x, "
@@ -188 +176 @@
 }
 
-/* Return -1 on error. */
+/* Return -1 on error, 0 on success */
 static s32 vt596_access(struct i2c_adapter *adap, u16 addr,
                 unsigned short flags, char read_write, u8 command,
                 int size, union i2c_smbus_data *data)
 {
-        int i, len;
+        int i;
 
         switch (size) {
         case I2C_SMBUS_QUICK:
-                outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
-                       SMBHSTADD);
                 size = VT596_QUICK;
                 break;
         case I2C_SMBUS_BYTE:
-                outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
-                       SMBHSTADD);
                 if (read_write == I2C_SMBUS_WRITE)
                         outb_p(command, SMBHSTCMD);
@@ -209 +193 @@
                 break;
         case I2C_SMBUS_BYTE_DATA:
-                outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
-                       SMBHSTADD);
                 outb_p(command, SMBHSTCMD);
                 if (read_write == I2C_SMBUS_WRITE)
@@ -217 +199 @@
                 break;
         case I2C_SMBUS_WORD_DATA:
-                outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
-                       SMBHSTADD);
                 outb_p(command, SMBHSTCMD);
                 if (read_write == I2C_SMBUS_WRITE) {
@@ -228 +208 @@
         case I2C_SMBUS_I2C_BLOCK_DATA:
                 if (!(vt596_features & FEATURE_I2CBLOCK))
-                        return -1;
+                        goto exit_unsupported;
                 if (read_write == I2C_SMBUS_READ)
                         outb_p(I2C_SMBUS_BLOCK_MAX, SMBHSTDAT0);
                 /* Fall through */
         case I2C_SMBUS_BLOCK_DATA:
-                outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
-                       SMBHSTADD);
                 outb_p(command, SMBHSTCMD);
                 if (read_write == I2C_SMBUS_WRITE) {
-                        len = data->block[0];
-                        if (len < 0)
-                                len = 0;
+                        u8 len = data->block[0];
                         if (len > I2C_SMBUS_BLOCK_MAX)
                                 len = I2C_SMBUS_BLOCK_MAX;
                         outb_p(len, SMBHSTDAT0);
-                        i = inb_p(SMBHSTCNT);   /* Reset SMBBLKDAT */
+                        inb_p(SMBHSTCNT);       /* Reset SMBBLKDAT */
                         for (i = 1; i <= len; i++)
                                 outb_p(data->block[i], SMBBLKDAT);
@@ -251 +227 @@
                 break;
         default:
-                dev_warn(&vt596_adapter, "Unsupported transaction %d\n", size);
-                return -1;
-        }
-
-        outb_p((size & 0x3C) + (ENABLE_INT9 & 1), SMBHSTCNT);
+                goto exit_unsupported;
+        }
+
+        outb_p(((addr & 0x7f) << 1) | read_write, SMBHSTADD);
+        outb_p((size & 0x3C), SMBHSTCNT);
 
         if (vt596_transaction()) /* Error in transaction */
@@ -265 +241 @@
         switch (size) {
         case VT596_BYTE:
-                /* Where is the result put? I assume here it is in
-                 * SMBHSTDAT0 but it might just as well be in the
-                 * SMBHSTCMD. No clue in the docs
-                 */
-                data->byte = inb_p(SMBHSTDAT0);
-                break;
         case VT596_BYTE_DATA:
                 data->byte = inb_p(SMBHSTDAT0);
@@ -282 +252 @@
                 if (data->block[0] > I2C_SMBUS_BLOCK_MAX)
                         data->block[0] = I2C_SMBUS_BLOCK_MAX;
-                i = inb_p(SMBHSTCNT);   /* Reset SMBBLKDAT */
+                inb_p(SMBHSTCNT);       /* Reset SMBBLKDAT */
                 for (i = 1; i <= data->block[0]; i++)
                         data->block[i] = inb_p(SMBBLKDAT);
@@ -288 +258 @@
         }
         return 0;
+
+exit_unsupported:
+        dev_warn(&vt596_adapter, "Unsupported command invoked! (0x%02x)\n",
+                 size);
+        return -1;
 }
 
@@ -325 +300 @@
         .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_VIA2,
         .algo           = &smbus_algorithm,
-        .name           = "unset",
         .inc_use        = vt596_inc,
         .dec_use        = vt596_dec,
@@ -344 +318 @@
 
         if ((pci_read_config_word(pdev, id->driver_data, &vt596_smba)) ||
-            !(vt596_smba & 0x1)) {
+            !(vt596_smba & 0x0001)) {
                 /* try 2nd address and config reg. for 596 */
                 if (id->device == PCI_DEVICE_ID_VIA_82C596_3 &&
                     !pci_read_config_word(pdev, SMBBA2, &vt596_smba) &&
-                    (vt596_smba & 0x1)) {
-                        smb_cf_hstcfg = 0x84;
+                    (vt596_smba & 0x0001)) {
+                        SMBHSTCFG = 0x84;
                 } else {
                         /* no matches at all */
@@ -367 +341 @@
 
 found:
-        if (!request_region(vt596_smba, 8, "viapro-smbus")) {
+        if (!request_region(vt596_smba, 8, vt596_driver.name)) {
                 dev_err(pdev, "SMBus region 0x%x already in use!\n",
                         vt596_smba);
@@ -382 +356 @@
                 dev_warn(pdev, "WARNING: SMBus interface set to new "
                          "address 0x%04x!\n", vt596_smba);
-        } else if ((temp & 1) == 0) {
+        } else if (!(temp & 0x01)) {
                 if (force) {
                         /* NOTE: This assumes I/O space and other allocations
@@ -390 +364 @@
                          * this.
                          */
-                        pci_write_config_byte(pdev, SMBHSTCFG, temp | 1);
+                        pci_write_config_byte(pdev, SMBHSTCFG, temp | 0x01);
                         dev_info(pdev, "Enabling SMBus device\n");
                 } else {
@@ -400 +374 @@
         }
 
-        if ((temp & 0x0E) == 8)
-                dev_dbg(pdev, "using Interrupt 9 for SMBus.\n");
-        else if ((temp & 0x0E) == 0)
-                dev_dbg(pdev, "using Interrupt SMI# for SMBus.\n");
-        else
-                dev_dbg(pdev, "Illegal Interrupt configuration "
-                        "(or code out of date)!\n");
-
-        pci_read_config_byte(pdev, SMBREV, &temp);
-        dev_dbg(pdev, "SMBREV = 0x%X\n", temp);
         dev_dbg(pdev, "VT596_smba = 0x%X\n", vt596_smba);