diff options
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r-- | drivers/staging/comedi/drivers/vmk80xx.c | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c index 64d90a16d83..533b625021a 100644 --- a/drivers/staging/comedi/drivers/vmk80xx.c +++ b/drivers/staging/comedi/drivers/vmk80xx.c | |||
@@ -32,7 +32,6 @@ Status: works | |||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
35 | #include <linux/comedidev.h> /* comedi definitions */ | ||
36 | #include <linux/module.h> | 35 | #include <linux/module.h> |
37 | #include <linux/mutex.h> | 36 | #include <linux/mutex.h> |
38 | #include <linux/errno.h> | 37 | #include <linux/errno.h> |
@@ -42,6 +41,8 @@ Status: works | |||
42 | #include <linux/usb.h> | 41 | #include <linux/usb.h> |
43 | #include <asm/uaccess.h> | 42 | #include <asm/uaccess.h> |
44 | 43 | ||
44 | #include "../comedidev.h" /* comedi definitions */ | ||
45 | |||
45 | /* ------------------------------------------------------------------------ */ | 46 | /* ------------------------------------------------------------------------ */ |
46 | #define VMK80XX_MODULE_DESC "Velleman USB Interface Board Kernel-Space Driver" | 47 | #define VMK80XX_MODULE_DESC "Velleman USB Interface Board Kernel-Space Driver" |
47 | #define VMK80XX_MODULE_DEVICE "Velleman K8055/K8061 USB Interface Board" | 48 | #define VMK80XX_MODULE_DEVICE "Velleman K8055/K8061 USB Interface Board" |
@@ -346,8 +347,8 @@ exit: | |||
346 | /* --------------------------------------------------------------------------- | 347 | /* --------------------------------------------------------------------------- |
347 | * COMEDI-Interface (callback functions for the userspacs apps). | 348 | * COMEDI-Interface (callback functions for the userspacs apps). |
348 | --------------------------------------------------------------------------- */ | 349 | --------------------------------------------------------------------------- */ |
349 | static int vm_ai_rinsn(comedi_device *dev, comedi_subdevice *s, | 350 | static int vm_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
350 | comedi_insn *insn, unsigned int *data) | 351 | struct comedi_insn *insn, unsigned int *data) |
351 | { | 352 | { |
352 | struct vmk80xx_usb *vm; | 353 | struct vmk80xx_usb *vm; |
353 | int minor = dev->minor; | 354 | int minor = dev->minor; |
@@ -399,8 +400,8 @@ error: | |||
399 | return retval; | 400 | return retval; |
400 | } | 401 | } |
401 | 402 | ||
402 | static int vm_ao_winsn(comedi_device *dev, comedi_subdevice *s, | 403 | static int vm_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
403 | comedi_insn *insn, unsigned int *data) | 404 | struct comedi_insn *insn, unsigned int *data) |
404 | { | 405 | { |
405 | struct vmk80xx_usb *vm; | 406 | struct vmk80xx_usb *vm; |
406 | int minor = dev->minor; | 407 | int minor = dev->minor; |
@@ -454,8 +455,8 @@ error: | |||
454 | return retval; | 455 | return retval; |
455 | } | 456 | } |
456 | 457 | ||
457 | static int vm_di_rinsn(comedi_device *dev, comedi_subdevice *s, | 458 | static int vm_di_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
458 | comedi_insn *insn, unsigned int *data) | 459 | struct comedi_insn *insn, unsigned int *data) |
459 | { | 460 | { |
460 | struct vmk80xx_usb *vm; | 461 | struct vmk80xx_usb *vm; |
461 | int minor = dev->minor; | 462 | int minor = dev->minor; |
@@ -504,8 +505,8 @@ error: | |||
504 | return retval; | 505 | return retval; |
505 | } | 506 | } |
506 | 507 | ||
507 | static int vm_do_winsn(comedi_device *dev, comedi_subdevice *s, | 508 | static int vm_do_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
508 | comedi_insn *insn, unsigned int *data) | 509 | struct comedi_insn *insn, unsigned int *data) |
509 | { | 510 | { |
510 | struct vmk80xx_usb *vm; | 511 | struct vmk80xx_usb *vm; |
511 | int minor = dev->minor; | 512 | int minor = dev->minor; |
@@ -555,8 +556,8 @@ error: | |||
555 | return retval; | 556 | return retval; |
556 | } | 557 | } |
557 | 558 | ||
558 | static int vm_cnt_rinsn(comedi_device *dev, comedi_subdevice *s, | 559 | static int vm_cnt_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
559 | comedi_insn *insn, unsigned int *data) | 560 | struct comedi_insn *insn, unsigned int *data) |
560 | { | 561 | { |
561 | struct vmk80xx_usb *vm; | 562 | struct vmk80xx_usb *vm; |
562 | int minor = dev->minor; | 563 | int minor = dev->minor; |
@@ -608,8 +609,8 @@ error: | |||
608 | return retval; | 609 | return retval; |
609 | } | 610 | } |
610 | 611 | ||
611 | static int vm_cnt_winsn(comedi_device *dev, comedi_subdevice *s, | 612 | static int vm_cnt_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
612 | comedi_insn *insn, unsigned int *data) | 613 | struct comedi_insn *insn, unsigned int *data) |
613 | { | 614 | { |
614 | struct vmk80xx_usb *vm; | 615 | struct vmk80xx_usb *vm; |
615 | int minor = dev->minor; | 616 | int minor = dev->minor; |
@@ -659,8 +660,8 @@ error: | |||
659 | return retval; | 660 | return retval; |
660 | } | 661 | } |
661 | 662 | ||
662 | static int vm_cnt_cinsn(comedi_device *dev, comedi_subdevice *s, | 663 | static int vm_cnt_cinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
663 | comedi_insn *insn, unsigned int *data) | 664 | struct comedi_insn *insn, unsigned int *data) |
664 | { | 665 | { |
665 | struct vmk80xx_usb *vm; | 666 | struct vmk80xx_usb *vm; |
666 | int minor = dev->minor; | 667 | int minor = dev->minor; |
@@ -749,9 +750,9 @@ static DEFINE_MUTEX(glb_mutex); | |||
749 | * Hook-up (or deallocate) the virtual device file '/dev/comedi[minor]' with | 750 | * Hook-up (or deallocate) the virtual device file '/dev/comedi[minor]' with |
750 | * the vmk80xx driver (comedi_config/rmmod). | 751 | * the vmk80xx driver (comedi_config/rmmod). |
751 | --------------------------------------------------------------------------- */ | 752 | --------------------------------------------------------------------------- */ |
752 | static int vm_attach(comedi_device *dev, comedi_devconfig *it) | 753 | static int vm_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
753 | { | 754 | { |
754 | comedi_subdevice *s; | 755 | struct comedi_subdevice *s; |
755 | int minor = dev->minor; | 756 | int minor = dev->minor; |
756 | int idx, i; | 757 | int idx, i; |
757 | 758 | ||
@@ -844,7 +845,7 @@ static int vm_attach(comedi_device *dev, comedi_devconfig *it) | |||
844 | return 0; | 845 | return 0; |
845 | } | 846 | } |
846 | 847 | ||
847 | static int vm_detach(comedi_device *dev) | 848 | static int vm_detach(struct comedi_device *dev) |
848 | { | 849 | { |
849 | struct vmk80xx_usb *vm; | 850 | struct vmk80xx_usb *vm; |
850 | int minor = dev->minor; | 851 | int minor = dev->minor; |
@@ -1060,16 +1061,13 @@ static void vm_disconnect(struct usb_interface *intf) | |||
1060 | * Register/Deregister this driver with/from the usb subsystem and the comedi. | 1061 | * Register/Deregister this driver with/from the usb subsystem and the comedi. |
1061 | --------------------------------------------------------------------------- */ | 1062 | --------------------------------------------------------------------------- */ |
1062 | static struct usb_driver vm_driver = { | 1063 | static struct usb_driver vm_driver = { |
1063 | #ifdef COMEDI_HAVE_USB_DRIVER_OWNER | ||
1064 | .owner = THIS_MODULE, | ||
1065 | #endif | ||
1066 | .name = "vmk80xx", | 1064 | .name = "vmk80xx", |
1067 | .probe = vm_probe, | 1065 | .probe = vm_probe, |
1068 | .disconnect = vm_disconnect, | 1066 | .disconnect = vm_disconnect, |
1069 | .id_table = vm_id_table, | 1067 | .id_table = vm_id_table, |
1070 | }; | 1068 | }; |
1071 | 1069 | ||
1072 | static comedi_driver driver_vm = { | 1070 | static struct comedi_driver driver_vm = { |
1073 | .module = THIS_MODULE, | 1071 | .module = THIS_MODULE, |
1074 | .driver_name = "vmk80xx", | 1072 | .driver_name = "vmk80xx", |
1075 | .attach = vm_attach, | 1073 | .attach = vm_attach, |