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

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

diff --git a/lincan/src/kv_pcican.c b/lincan/src/kv_pcican.c
index 758b8fb043260a6b6baed8fceb5ed6e63db0b808..30ac37731d6848ca74066a76b460b41f50d1f8be 100644 (file)
--- a/lincan/src/kv_pcican.c
+++ b/lincan/src/kv_pcican.c
@@ -205,16 +205,16 @@ int kv_pcican_reset(struct candevice_t *candev)
 
 int kv_pcican_init_hw_data(struct candevice_t *candev)
 {
 
 int kv_pcican_init_hw_data(struct candevice_t *candev)
 {

-       struct pci_dev *pcidev = NULL;
+       struct pci_dev *pcidev;

        int i;
 
        int i;
 

-       do {
-               pcidev = pci_find_device(KV_PCICAN_PCICAN_VENDOR, KV_PCICAN_PCICAN_ID, pcidev);
-               if(pcidev == NULL) return -ENODEV;
-       } while(can_check_dev_taken(pcidev));
+       pcidev = can_pci_get_next_untaken_device(KV_PCICAN_PCICAN_VENDOR, KV_PCICAN_PCICAN_ID);
+       if(pcidev == NULL)
+               return -ENODEV;

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

+               can_pci_dev_put(pcidev);

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


@@ -222,6 +222,7 @@ int kv_pcican_init_hw_data(struct candevice_t *candev)
        for(i=0;i<3;i++){
                if(!(pci_resource_flags(pcidev,i)&IORESOURCE_IO)){
                        printk(KERN_CRIT "PCICAN region %d is not IO\n",i);
        for(i=0;i<3;i++){
                if(!(pci_resource_flags(pcidev,i)&IORESOURCE_IO)){
                        printk(KERN_CRIT "PCICAN region %d is not IO\n",i);

+                       can_pci_dev_put(pcidev);

                        return -EIO;
                }
        }
                        return -EIO;
                }
        }


@@ -250,6 +251,12 @@ int kv_pcican_init_hw_data(struct candevice_t *candev)
        return 0;
 }
 
        return 0;
 }
 

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

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


@@ -291,6 +298,7 @@ int kv_pcican_register(struct hwspecops_t *hwspecops)
        hwspecops->release_io = kv_pcican_release_io;
        hwspecops->reset = kv_pcican_reset;
        hwspecops->init_hw_data = kv_pcican_init_hw_data;
        hwspecops->release_io = kv_pcican_release_io;
        hwspecops->reset = kv_pcican_reset;
        hwspecops->init_hw_data = kv_pcican_init_hw_data;

+       hwspecops->done_hw_data = kv_pcican_done_hw_data;

        hwspecops->init_chip_data = kv_pcican_init_chip_data;
        hwspecops->init_obj_data = kv_pcican_init_obj_data;
        hwspecops->write_register = kv_pcican_write_register;
        hwspecops->init_chip_data = kv_pcican_init_chip_data;
        hwspecops->init_obj_data = kv_pcican_init_obj_data;
        hwspecops->write_register = kv_pcican_write_register;