Changeset 1662

Timestamp:

12/04/02 03:52:36 (11 years ago)

Author:

mds

Message:

more 2.2 fixes from Vojtech

Files:

• lm-sensors/trunk/kernel/busses/i2c-amd8111.c (modified) (8 diffs)

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

@@ -27 +27 @@
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
+#include <linux/kcomp.h>
+#define MAX_PCI_DEVS    8
+static struct pci_dev *amd8111_devs[MAX_PCI_DEVS] = { NULL, /* ... */ };
+static void *amd8111_drvdata[MAX_PCI_DEVS];
+static int amd8111_devcnt = 0;
+
 #define min_t(t, x, y)  (((x)<(y))?(x):(y))
 #define __devinit
@@ -46 +52 @@
 };
 #define PCI_ANY_ID      0xffff
-#define IORESOURCE_IO 0x00000100
+
+static void *pci_get_drvdata(struct pci_dev *dev)
+{
+        int i;
+        for (i = 0; i < amd8111_devcnt; i++)
+                if (amd8111_devs[i] == dev)
+                        return amd8111_drvdata[i];
+        return NULL;
+}
+
+static void pci_set_drvdata(struct pci_dev *dev, void *driver_data)
+{
+        int i;
+        for (i = 0; i < amd8111_devcnt; i++)
+                if (amd8111_devs[i] == dev)
+                        amd8111_drvdata[i] = driver_data;
+}
+
 #endif
 
@@ -378 +401 @@
                 return -1;
 
-        if (!(smbus = (void*)kmalloc(sizeof(struct amd_smbus), GFP_KERNEL)))
+        if (!(smbus = kmalloc(sizeof(struct amd_smbus), GFP_KERNEL)))
                 return -1;
         memset(smbus, 0, sizeof(struct amd_smbus));
@@ -426 +449 @@
 static void __devexit amd8111_remove(struct pci_dev *dev)
 {
-        struct amd_smbus *smbus = (void*) pci_get_drvdata(dev);
+        struct amd_smbus *smbus = pci_get_drvdata(dev);
         if (i2c_del_adapter(&smbus->adapter)) {
                 printk(KERN_WARNING "i2c-amd8111.c: Failed to unregister adapter.\n");
@@ -441 +464 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
 
-static struct pci_dev *amd8111_devs[8] = { NULL, /* ... */ };
-static int amd8111_devcnt = 0;
-
-int i2c_amd_8111_init(void)
+int i2c_amd8111_init(void)
 {
         struct pci_dev *pci;
@@ -460 +480 @@
 }
 
-#ifdef MODULE
-int init_module(void)
+int __init amd8111_init(void)
 {
         return i2c_amd8111_init();
 }
 
-int cleanup_module(void)
+void __exit amd8111_exit(void)
 {
         int i;
@@ -472 +491 @@
                 amd8111_remove(amd8111_devs[i]);
 }
-#endif 
 
 #else
@@ -493 +511 @@
 }
 
+
+MODULE_DEVICE_TABLE(pci, amd8111_id_table);
+
+#endif
+
 module_init(amd8111_init);
 module_exit(amd8111_exit);
 
-#endif