|
@@ -48,17 +48,6 @@
|
|
|
|
|
|
static DEFINE_MUTEX(start_stop_sem);
|
|
|
|
|
|
-static DEFINE_PCI_DEVICE_TABLE(dyna_pci10xx_pci_table) = {
|
|
|
- { PCI_DEVICE(PCI_VENDOR_ID_DYNALOG, 0x1050) },
|
|
|
- { 0 }
|
|
|
-};
|
|
|
-
|
|
|
-MODULE_DEVICE_TABLE(pci, dyna_pci10xx_pci_table);
|
|
|
-
|
|
|
-static int dyna_pci10xx_attach(struct comedi_device *dev,
|
|
|
- struct comedi_devconfig *it);
|
|
|
-static int dyna_pci10xx_detach(struct comedi_device *dev);
|
|
|
-
|
|
|
static const struct comedi_lrange range_pci1050_ai = { 3, {
|
|
|
BIP_RANGE(10),
|
|
|
BIP_RANGE(5),
|
|
@@ -113,16 +102,6 @@ static const struct boardtype boardtypes[] = {
|
|
|
{.name = DRV_NAME},
|
|
|
};
|
|
|
|
|
|
-static struct comedi_driver driver_dyna_pci10xx = {
|
|
|
- .driver_name = DRV_NAME,
|
|
|
- .module = THIS_MODULE,
|
|
|
- .attach = dyna_pci10xx_attach,
|
|
|
- .detach = dyna_pci10xx_detach,
|
|
|
- .board_name = &boardtypes[0].name,
|
|
|
- .offset = sizeof(struct boardtype),
|
|
|
- .num_names = ARRAY_SIZE(boardtypes),
|
|
|
-};
|
|
|
-
|
|
|
struct dyna_pci10xx_private {
|
|
|
struct pci_dev *pci_dev; /* ptr to PCI device */
|
|
|
char valid; /* card is usable */
|
|
@@ -418,6 +397,16 @@ static int dyna_pci10xx_detach(struct comedi_device *dev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static struct comedi_driver driver_dyna_pci10xx = {
|
|
|
+ .driver_name = DRV_NAME,
|
|
|
+ .module = THIS_MODULE,
|
|
|
+ .attach = dyna_pci10xx_attach,
|
|
|
+ .detach = dyna_pci10xx_detach,
|
|
|
+ .board_name = &boardtypes[0].name,
|
|
|
+ .offset = sizeof(struct boardtype),
|
|
|
+ .num_names = ARRAY_SIZE(boardtypes),
|
|
|
+};
|
|
|
+
|
|
|
static int __devinit driver_dyna_pci10xx_pci_probe(struct pci_dev *dev,
|
|
|
const struct pci_device_id *ent)
|
|
|
{
|
|
@@ -429,10 +418,16 @@ static void __devexit driver_dyna_pci10xx_pci_remove(struct pci_dev *dev)
|
|
|
comedi_pci_auto_unconfig(dev);
|
|
|
}
|
|
|
|
|
|
+static DEFINE_PCI_DEVICE_TABLE(dyna_pci10xx_pci_table) = {
|
|
|
+ { PCI_DEVICE(PCI_VENDOR_ID_DYNALOG, 0x1050) },
|
|
|
+ { 0 }
|
|
|
+};
|
|
|
+MODULE_DEVICE_TABLE(pci, dyna_pci10xx_pci_table);
|
|
|
+
|
|
|
static struct pci_driver driver_dyna_pci10xx_pci_driver = {
|
|
|
- .id_table = dyna_pci10xx_pci_table,
|
|
|
- .probe = &driver_dyna_pci10xx_pci_probe,
|
|
|
- .remove = __devexit_p(&driver_dyna_pci10xx_pci_remove)
|
|
|
+ .id_table = dyna_pci10xx_pci_table,
|
|
|
+ .probe = driver_dyna_pci10xx_pci_probe,
|
|
|
+ .remove = __devexit_p(driver_dyna_pci10xx_pci_remove),
|
|
|
};
|
|
|
|
|
|
static int __init driver_dyna_pci10xx_init_module(void)
|
|
@@ -447,14 +442,13 @@ static int __init driver_dyna_pci10xx_init_module(void)
|
|
|
(char *)driver_dyna_pci10xx.driver_name;
|
|
|
return pci_register_driver(&driver_dyna_pci10xx_pci_driver);
|
|
|
}
|
|
|
+module_init(driver_dyna_pci10xx_init_module);
|
|
|
|
|
|
static void __exit driver_dyna_pci10xx_cleanup_module(void)
|
|
|
{
|
|
|
pci_unregister_driver(&driver_dyna_pci10xx_pci_driver);
|
|
|
comedi_driver_unregister(&driver_dyna_pci10xx);
|
|
|
}
|
|
|
-
|
|
|
-module_init(driver_dyna_pci10xx_init_module);
|
|
|
module_exit(driver_dyna_pci10xx_cleanup_module);
|
|
|
|
|
|
MODULE_LICENSE("GPL");
|