int kv_pcican_init_hw_data(struct candevice_t *candev)
{
- struct pci_dev *pcidev = NULL;
+ struct pci_dev *pcidev;
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");
+ can_pci_dev_put(pcidev);
return -EIO;
}
candev->sysdevptr.pcidev=pcidev;
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 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)
{
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;