Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / drivers / i2c / busses / i2c-piix4.c

diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index debc76cd2161c64b1c675d196ec8d40e3b9c8e50..fdc9ad805e358528b8599f0dbd4635bb817155e7 100644 (file)
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -23,7 +23,7 @@
    Supports:
        Intel PIIX4, 440MX
        Serverworks OSB4, CSB5, CSB6, HT-1000
-       ATI IXP200, IXP300, IXP400, SB600, SB700
+       ATI IXP200, IXP300, IXP400, SB600, SB700, SB800
        SMSC Victory66
 
    Note: we assume there can only be one device, with one SMBus interface.
@@ -38,7 +38,6 @@
 #include <linux/ioport.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
-#include <linux/apm_bios.h>
 #include <linux/dmi.h>
 #include <asm/io.h>
 
@@ -121,10 +120,6 @@ static int __devinit piix4_setup(struct pci_dev *PIIX4_dev,
 {
        unsigned char temp;
 
-       /* match up the function */
-       if (PCI_FUNC(PIIX4_dev->devfn) != id->driver_data)
-               return -ENODEV;
-
        dev_info(&PIIX4_dev->dev, "Found %s device\n", pci_name(PIIX4_dev));
 
        /* Don't access SMBus on IBM systems which get corrupted eeproms */
@@ -227,7 +222,7 @@ static int piix4_transaction(void)
                        dev_err(&piix4_adapter.dev, "Failed! (%02x)\n", temp);
                        return -1;
                } else {
-                       dev_dbg(&piix4_adapter.dev, "Successfull!\n");
+                       dev_dbg(&piix4_adapter.dev, "Successful!\n");
                }
        }
 
@@ -347,12 +342,7 @@ static s32 piix4_access(struct i2c_adapter * adap, u16 addr,
 
 
        switch (size) {
-       case PIIX4_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 PIIX4_BYTE:
        case PIIX4_BYTE_DATA:
                data->byte = inb_p(SMBHSTDAT0);
                break;
@@ -389,30 +379,21 @@ static struct i2c_adapter piix4_adapter = {
 };
 
 static struct pci_device_id piix4_ids[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3),
-         .driver_data = 3 },
-       { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP200_SMBUS),
-         .driver_data = 0 },
-       { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_SMBUS),
-         .driver_data = 0 },
-       { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS),
-         .driver_data = 0 },
-       { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SMBUS),
-         .driver_data = 0 },
-       { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SMBUS),
-         .driver_data = 0 },
-       { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4),
-         .driver_data = 0 },
-       { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5),
-         .driver_data = 0 },
-       { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6),
-         .driver_data = 0 },
-       { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000SB),
-         .driver_data = 0 },
-       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3),
-         .driver_data = 3 },
-       { PCI_DEVICE(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_3),
-         .driver_data = 0 },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3) },
+       { PCI_DEVICE(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_3) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP200_SMBUS) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_SMBUS) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS) },
+       { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,
+                    PCI_DEVICE_ID_SERVERWORKS_OSB4) },
+       { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,
+                    PCI_DEVICE_ID_SERVERWORKS_CSB5) },
+       { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,
+                    PCI_DEVICE_ID_SERVERWORKS_CSB6) },
+       { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,
+                    PCI_DEVICE_ID_SERVERWORKS_HT1000SB) },
        { 0, }
 };