Changeset 4061

Timestamp:

06/23/06 23:05:37 (7 years ago)

Author:

khali

Message:

Various cleanups to the i2c-i801 driver:
* Fix self file name reference.
* i801_setup can be marked devinit.
* Drop useless error local variable and label in i801_setup.
* Use symbolic names for SMBHSTCFG bits.
* Transmit the error code returned by i801_setup instead of forcing it

to an arbitrary value.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• kernel/busses/i2c-i801.c (modified) (7 diffs)

lm-sensors/trunk/CHANGES

@@ -19 +19 @@
                    Fix block transaction poll loops (2.6 backport)
                    Remove PCI function check (2.6 backport)
+                   Cleanups (2.6 backport)
   Module i2c-nforce2: Add nForce4 MCP51, MCP55 support (2.6 backport)
   Module i2c-piix4: Add ServerWorks HT-1000 support (2.6 backport)

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

@@ -1 +1 @@
 /*
-    i801.c - Part of lm_sensors, Linux kernel modules for hardware
+    i2c-i801.c - Part of lm_sensors, Linux kernel modules for hardware
               monitoring
     Copyright (c) 1998 - 2002  Frodo Looijaard <frodol@dds.nl>,
@@ -162 +162 @@
 static int isich5;      /* is i2c block read supported? */
 
-static int i801_setup(struct pci_dev *dev)
-{
-        int error_return = 0;
+static int __devinit i801_setup(struct pci_dev *dev)
+{
         unsigned char temp;
 
@@ -180 +179 @@
         isich5 = isich4 && dev->device != PCI_DEVICE_ID_INTEL_82801DB_3;
 
-        /* Determine the address of the SMBus areas */
+        /* Determine the address of the SMBus area */
         if (force_addr) {
                 i801_smba = force_addr & 0xfff0;
@@ -196 +195 @@
                 dev_err(dev, "I801_smb region 0x%x already in use!\n",
                         i801_smba);
-                error_return = -EBUSY;
-                goto END;
+                return -EBUSY;
         }
 
@@ -207 +205 @@
            sure, we disable the device first. */
         if (force_addr) {
-                pci_write_config_byte(I801_dev, SMBHSTCFG, temp & 0xfe);
+                pci_write_config_byte(I801_dev, SMBHSTCFG,
+                                      temp & ~SMBHSTCFG_HST_EN);
                 pci_write_config_word(I801_dev, SMBBA, i801_smba);
-                pci_write_config_byte(I801_dev, SMBHSTCFG, temp | 0x01);
+                pci_write_config_byte(I801_dev, SMBHSTCFG,
+                                      temp | SMBHSTCFG_HST_EN);
                 dev_warn(dev, "WARNING: I801 SMBus interface set to "
                         "new address %04x!\n", i801_smba);
-        } else if ((temp & 1) == 0) {
-                pci_write_config_byte(I801_dev, SMBHSTCFG, temp | 1);
+        } else if (!(temp & SMBHSTCFG_HST_EN)) {
+                pci_write_config_byte(I801_dev, SMBHSTCFG,
+                                      temp | SMBHSTCFG_HST_EN);
                 dev_warn(dev, "enabling SMBus device\n");
         }
 
-        if (temp & 0x02)
+        if (temp & SMBHSTCFG_SMB_SMI_EN)
                 dev_dbg(dev, "I801 using Interrupt SMI# for SMBus.\n");
         else
@@ -226 +227 @@
         dev_dbg(dev, "I801_smba = 0x%X\n", i801_smba);
 
-END:
-        return error_return;
+        return 0;
 }
 
@@ -681 +681 @@
 static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
-
-        if (i801_setup(dev)) {
-                dev_warn(dev,
-                        "I801 not detected, module not inserted.\n");
-                return -ENODEV;
-        }
+        int err;
+
+        if ((err = i801_setup(dev)))
+                return err;
 
         snprintf(i801_adapter.name, 32,