LinCAN PCI cards support updated to support PCI devices reference counting.

[lincan.git] / lincan / src / esdpci200.c

diff --git a/lincan/src/esdpci200.c b/lincan/src/esdpci200.c
index 718db1eefd7c68d30882b2945fa84c23cd94315c..292ae9071b6820433ac219de25afd54361ca04b0 100644 (file)
--- a/lincan/src/esdpci200.c
+++ b/lincan/src/esdpci200.c
@@ -290,15 +290,15 @@ int esdpci200_reset(struct candevice_t *candev)
 
 int esdpci200_init_hw_data(struct candevice_t *candev)
 {
 
 int esdpci200_init_hw_data(struct candevice_t *candev)
 {

-       struct pci_dev *pcidev = NULL;
+       struct pci_dev *pcidev;
+
+       pcidev = can_pci_get_next_untaken_device(ESDPCI200_PCI_VENDOR_ID, ESDPCI200_PCI_PRODUCT_ID);
+       if(pcidev == NULL)
+               return -ENODEV;

 
 

-       do {
-               pcidev = pci_find_device(ESDPCI200_PCI_VENDOR_ID, ESDPCI200_PCI_PRODUCT_ID, pcidev);
-               if(pcidev == NULL) return -ENODEV;
-       } while(can_check_dev_taken(pcidev));
-       

        if (pci_enable_device (pcidev)){
                printk(KERN_CRIT "Setup of ESDPCI200 failed\n");
        if (pci_enable_device (pcidev)){
                printk(KERN_CRIT "Setup of ESDPCI200 failed\n");

+               can_pci_dev_put(pcidev);

                return -EIO;
        }
        candev->sysdevptr.pcidev=pcidev;
                return -EIO;
        }
        candev->sysdevptr.pcidev=pcidev;


@@ -308,17 +308,20 @@ int esdpci200_init_hw_data(struct candevice_t *candev)
        if(!(pci_resource_flags(pcidev, 0)&IORESOURCE_MEM))
        {
           printk(KERN_CRIT "PCI200 region %d is not MEM\n",0);
        if(!(pci_resource_flags(pcidev, 0)&IORESOURCE_MEM))
        {
           printk(KERN_CRIT "PCI200 region %d is not MEM\n",0);

+          can_pci_dev_put(pcidev);

           return -EIO;
        }
        if(!(pci_resource_flags(pcidev, 1)&IORESOURCE_IO))
        {
           printk(KERN_CRIT "PCI200 region %d is not IO\n",1);
           return -EIO;
        }
        if(!(pci_resource_flags(pcidev, 1)&IORESOURCE_IO))
        {
           printk(KERN_CRIT "PCI200 region %d is not IO\n",1);

+          can_pci_dev_put(pcidev);

           return -EIO;
        }
 
        if(!(pci_resource_flags(pcidev,2)&IORESOURCE_MEM))
        {
           printk(KERN_CRIT "PCI200 region %d is not MEM\n",2);
           return -EIO;
        }
 
        if(!(pci_resource_flags(pcidev,2)&IORESOURCE_MEM))
        {
           printk(KERN_CRIT "PCI200 region %d is not MEM\n",2);

+          can_pci_dev_put(pcidev);

           return -EIO;
        }
 
           return -EIO;
        }
 


@@ -339,6 +342,12 @@ int esdpci200_init_hw_data(struct candevice_t *candev)
        return 0;
 }
 
        return 0;
 }
 

+void esdpci200_done_hw_data(struct candevice_t *candev)
+{
+       struct pci_dev *pcidev = candev->sysdevptr.pcidev;
+       can_pci_dev_put(pcidev);
+}
+

 int esdpci200_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 
 int esdpci200_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 


@@ -389,6 +398,7 @@ int esdpci200_register(struct hwspecops_t *hwspecops)
        hwspecops->release_io = esdpci200_release_io;
        hwspecops->reset = esdpci200_reset;
        hwspecops->init_hw_data = esdpci200_init_hw_data;
        hwspecops->release_io = esdpci200_release_io;
        hwspecops->reset = esdpci200_reset;
        hwspecops->init_hw_data = esdpci200_init_hw_data;

+       hwspecops->done_hw_data = esdpci200_done_hw_data;

        hwspecops->init_chip_data = esdpci200_init_chip_data;
        hwspecops->init_obj_data = esdpci200_init_obj_data;
        hwspecops->write_register = esdpci200_write_register;
        hwspecops->init_chip_data = esdpci200_init_chip_data;
        hwspecops->init_obj_data = esdpci200_init_obj_data;
        hwspecops->write_register = esdpci200_write_register;