Changeset 4625

Timestamp:

07/18/07 23:02:42 (1 year ago)

Author:

khali

Message:

Whitespace cleaups (backport from Linux 2.6).

Files:

• lm-sensors/trunk/kernel/busses/i2c-i801.c (modified) (11 diffs)

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

@@ -23 +23 @@
-/*
-    SUPPORTED DEVICES   PCI ID
-           
-           
-           
-           
+
+
+
+
-    82801DB             24C3   (HW PEC supported, 32 byte buffer not supported)
-    82801EB             24D3   (HW PEC supported, 32 byte buffer not supported)
@@ -158 +158 @@
-                 "EXTREMELY DANGEROUS!");
-
-static int i801_transaction(void);
-static int i801_block_transaction(union i2c_smbus_data *data, char read_write,
-                                  int command, int hwpec);
-
-static unsigned short i801_smba;
-static struct pci_driver i801_driver;
@@ -176 +172 @@
-            dev->device == PCI_DEVICE_ID_INTEL_82801EB_3 ||
-            dev->device == PCI_DEVICE_ID_INTEL_ESB_4 ||
-      
+
-            dev->device == PCI_DEVICE_ID_INTEL_ICH6_16 ||
-            dev->device == PCI_DEVICE_ID_INTEL_ICH7_17 ||
@@ -336 +332 @@
-                if (len < 1)
-                        len = 1;
-32
-32
+I2C_SMBUS_BLOCK_MAX
+I2C_SMBUS_BLOCK_MAX
-                outb_p(len, SMBHSTDAT0);
-                outb_p(data->block[1], SMBBLKDAT);
@@ -344 +340 @@
-        }
-
-        if(isich4 && command != I2C_SMBUS_I2C_BLOCK_DATA) {
-                /* set 32 byte buffer */
-        }
-
-        for (i = 1; i <= len; i++) {
-                if (i == len && read_write == I2C_SMBUS_READ)
-                        smbcmd = I801_BLOCK_LAST;
-                else if (command == I2C_SMBUS_I2C_BLOCK_DATA &&
-        
+       
-                        smbcmd = I801_I2C_BLOCK_DATA;
-                else
@@ -366 +358 @@
-                temp = inb_p(SMBHSTSTS);
-                if (i == 1) {
-nous conditions before transaction: 
+ous conditions before transaction:
-                         * Byte_Done, Failed, Bus_Err, Dev_Err, Intr, Host_Busy */
-=0x9f; 
+ = 0x9f;
-                } else {
-nous conditions during transaction: 
+ous conditions during transaction:
-                         * Failed, Bus_Err, Dev_Err, Intr */
-=0x1e; 
+ = 0x1e;
-                }
-                if (temp & errmask) {
@@ -382 +374 @@
-                                        "Reset failed! (%02x)\n", temp);
-                                result = -1;
-                                
+                               
-                        }
-                        if (i != 1) {
@@ -400 +392 @@
-                        temp = inb_p(SMBHSTSTS);
-                }
-    
-       
+
+    
-
-                /* If the SMBus is still busy, we give up */
@@ -426 +418 @@
-                                if (len < 1)
-                                        len = 1;
-32
-32
+I2C_SMBUS_BLOCK_MAX
+I2C_SMBUS_BLOCK_MAX
-                                data->block[0] = len;
-                        } else {
@@ -469 +461 @@
-                        dev_dbg(I801_dev, "PEC Timeout!\n");
-                }
- 
+
-        }
-        result = 0;
@@ -597 +589 @@
-#if 0
-             | (isich5 ? I2C_FUNC_SMBUS_READ_I2C_BLOCK
-        
+       
-#endif
-            ;