Changeset 1768

Timestamp:

06/07/03 21:53:21 (10 years ago)

Author:

mds

Message:

populate pci_device_id tables so the module will load. untested.

Location:

lm-sensors/trunk/kernel/busses

Files:

• i2c-ali1535.c (modified) (3 diffs)
• i2c-hydra.c (modified) (1 diff)
• i2c-savage4.c (modified) (1 diff)
• i2c-sis5595.c (modified) (3 diffs)

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

@@ -148 +148 @@
    newer kernels with the real PCI interface. In compat.h some things are
    defined to make the transition easier. */
-int ali1535_setup(void)
+int ali1535_setup(struct pci_dev *ALI1535_dev)
 {
         int error_return = 0;
         unsigned char temp;
-
-        struct pci_dev *ALI1535_dev;
-
-        /* First check whether we can access PCI at all */
-        if (pci_present() == 0) {
-                printk("i2c-ali1535.o: Error: No PCI-bus found!\n");
-                error_return = -ENODEV;
-                goto END;
-        }
-
-        /* Look for the ALI1535, M7101 device */
-        ALI1535_dev = NULL;
-        ALI1535_dev = pci_find_device(PCI_VENDOR_ID_AL,
-                                      PCI_DEVICE_ID_AL_M7101, 
-                                      ALI1535_dev); 
-
-        if (ALI1535_dev == NULL) {
-                printk("i2c-ali1535.o: Error: Can't detect ali1535!\n");
-                error_return = -ENODEV;
-                goto END;
-        }
 
 /* Check the following things:
@@ -565 +544 @@
 
 static struct pci_device_id ali1535_ids[] __devinitdata = {
+        {
+        .vendor =       PCI_VENDOR_ID_AL,
+        .device =       PCI_DEVICE_ID_AL_M7101,
+        .subvendor =    PCI_ANY_ID,
+        .subdevice =    PCI_ANY_ID,
+        },
         { 0, }
 };
@@ -570 +555 @@
 static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        if (ali1535_setup()) {
+        if (ali1535_setup(dev)) {
                 printk
                     ("i2c-ali1535.o: ALI1535 not detected, module not inserted.\n");

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

@@ -118 +118 @@
 };
 
-
-/* PCI device */
-#define VENDOR          PCI_VENDOR_ID_APPLE
-#define DEVICE          PCI_DEVICE_ID_APPLE_HYDRA
-
 static struct pci_device_id hydra_ids[] __devinitdata = {
+        {
+                .vendor =       PCI_VENDOR_ID_APPLE,
+                .device =       PCI_DEVICE_ID_APPLE_HYDRA,
+                .subvendor =    PCI_ANY_ID,
+                .subdevice =    PCI_ANY_ID,
+        },
         { 0, }
 };

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

@@ -168 +168 @@
 };
 
-#if 0
-PCI_VENDOR_ID_S3, PCI_CHIP_SAVAGE4,
-PCI_VENDOR_ID_S3, PCI_CHIP_SAVAGE2000,
-#endif
-
 static struct pci_device_id savage4_ids[] __devinitdata = {
+        {
+                .vendor =       PCI_VENDOR_ID_S3,
+                .device =       PCI_CHIP_SAVAGE4,
+                .subvendor =    PCI_ANY_ID,
+                .subdevice =    PCI_ANY_ID,
+        },
+        {
+                .vendor =       PCI_VENDOR_ID_S3,
+                .device =       PCI_CHIP_SAVAGE2000,
+                .subvendor =    PCI_ANY_ID,
+                .subdevice =    PCI_ANY_ID,
+        },
         { 0, }
 };

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

@@ -142 +142 @@
    newer kernels with the real PCI interface. In compat.h some things are
    defined to make the transition easier. */
-int sis5595_setup(void)
+int sis5595_setup(struct pci_dev *SIS5595_dev)
 {
         u16 a;
         u8 val;
-        struct pci_dev *SIS5595_dev;
         int *i;
-
-        /* First check whether we can access PCI at all */
-        if (pci_present() == 0) {
-                printk("i2c-sis5595.o: Error: No PCI-bus found!\n");
-                return -ENODEV;
-        }
-
-        /* Look for the SIS5595 */
-        SIS5595_dev = NULL;
-        if (!(SIS5595_dev = pci_find_device(PCI_VENDOR_ID_SI,
-                                            PCI_DEVICE_ID_SI_503,
-                                            SIS5595_dev))) {
-                printk("i2c-sis5595.o: Error: Can't detect SIS5595!\n");
-                return -ENODEV;
-        }
 
         /* Look for imposters */
@@ -426 +410 @@
 
 static struct pci_device_id sis5595_ids[] __devinitdata = {
+        {
+                .vendor =       PCI_VENDOR_ID_SI,
+                .device =       PCI_DEVICE_ID_SI_503,
+                .subvendor =    PCI_ANY_ID,
+                .subdevice =    PCI_ANY_ID,
+        },
         { 0, }
 };
@@ -432 +422 @@
 {
 
-        if (sis5595_setup()) {
+        if (sis5595_setup(dev)) {
                 printk
                     ("i2c-sis5595.o: SIS5595 not detected, module not inserted.\n");