int nr_chips;
u16 subsysid;
- i = 0;
- do {
- pcidev = pci_find_device(PCAN_PCI_VENDOR_ID, PCAN_PCI_PRODUCT_ID, pcidev);
- if(pcidev == NULL) {
- printk(KERN_ERR "No unused PCAN_PCI #%d card found\n", i);
- return -ENODEV;
- }
- i++;
- } while(can_check_dev_taken(pcidev));
+ pcidev = can_pci_get_next_untaken_device(PCAN_PCI_VENDOR_ID, PCAN_PCI_PRODUCT_ID);
+ if(pcidev == NULL) {
+ printk(KERN_ERR "No unused PCAN_PCI card found\n");
+ return -ENODEV;
+ }
if (pci_enable_device (pcidev)){
printk(KERN_ERR "Enable PCAN_PCI failed\n");
+ can_pci_dev_put(pcidev);
return -EIO;
}
candev->sysdevptr.pcidev=pcidev;
printk(KERN_CRIT "Setup of PCAN_PCI failed\n");
pci_disable_device (pcidev);
+ can_pci_dev_put(pcidev);
return -EIO;
}
+void pcan_pci_done_hw_data(struct candevice_t *candev)
+{
+ struct pci_dev *pcidev = candev->sysdevptr.pcidev;
+ can_pci_dev_put(pcidev);
+}
+
int pcan_pci_init_chip_data(struct candevice_t *candev, int chipnr)
{
hwspecops->release_io = pcan_pci_release_io;
hwspecops->reset = pcan_pci_reset;
hwspecops->init_hw_data = pcan_pci_init_hw_data;
+ hwspecops->done_hw_data = pcan_pci_done_hw_data;
hwspecops->init_chip_data = pcan_pci_init_chip_data;
hwspecops->init_obj_data = pcan_pci_init_obj_data;
hwspecops->write_register = pcan_pci_write_register;