Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / staging / comedi / comedidev.h

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index ebdccfdf220ea64f5671470cca30c0b3a806b793..68aa9176d2490c821d4e94ccec459df53390f964 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -53,73 +53,9 @@
        COMEDI_MINORVERSION, COMEDI_MICROVERSION)
 #define COMEDI_RELEASE VERSION
 
-#define COMEDI_INITCLEANUP_NOMODULE(x)                                 \
-       static int __init x ## _init_module(void)                       \
-               {return comedi_driver_register(&(x)); }                 \
-       static void __exit x ## _cleanup_module(void)                   \
-               {comedi_driver_unregister(&(x)); }                      \
-       module_init(x ## _init_module);                                 \
-       module_exit(x ## _cleanup_module);
-
-#define COMEDI_MODULE_MACROS                                           \
-       MODULE_AUTHOR("Comedi http://www.comedi.org");          \
-       MODULE_DESCRIPTION("Comedi low-level driver");                  \
-       MODULE_LICENSE("GPL");
-
-#define COMEDI_INITCLEANUP(x)                                          \
-       COMEDI_MODULE_MACROS            \
-       COMEDI_INITCLEANUP_NOMODULE(x)
-
-#define COMEDI_PCI_INITCLEANUP_NOMODULE(comedi_driver, pci_id_table) \
-       static int __devinit comedi_driver ## _pci_probe(struct pci_dev *dev, \
-               const struct pci_device_id *ent) \
-       { \
-               return comedi_pci_auto_config(dev, comedi_driver.driver_name); \
-       } \
-       static void __devexit comedi_driver ## _pci_remove(\
-               struct pci_dev *dev) \
-       { \
-               comedi_pci_auto_unconfig(dev); \
-       } \
-       static struct pci_driver comedi_driver ## _pci_driver = \
-       { \
-               .id_table = pci_id_table, \
-               .probe = &comedi_driver ## _pci_probe, \
-               .remove = __devexit_p(&comedi_driver ## _pci_remove) \
-       }; \
-       static int __init comedi_driver ## _init_module(void) \
-       { \
-               int retval; \
-               retval = comedi_driver_register(&comedi_driver); \
-               if (retval < 0) \
-                       return retval; \
-                       comedi_driver ## _pci_driver.name = \
-                               (char *)comedi_driver.driver_name; \
-               return pci_register_driver(&comedi_driver ## _pci_driver); \
-       } \
-       static void __exit comedi_driver ## _cleanup_module(void) \
-       { \
-               pci_unregister_driver(&comedi_driver ## _pci_driver); \
-               comedi_driver_unregister(&comedi_driver); \
-       } \
-       module_init(comedi_driver ## _init_module); \
-       module_exit(comedi_driver ## _cleanup_module);
-
-#define COMEDI_PCI_INITCLEANUP(comedi_driver, pci_id_table) \
-       COMEDI_MODULE_MACROS \
-       COMEDI_PCI_INITCLEANUP_NOMODULE(comedi_driver, pci_id_table)
-
-#define PCI_VENDOR_ID_INOVA            0x104c
-#define PCI_VENDOR_ID_NATINST          0x1093
-#define PCI_VENDOR_ID_DATX             0x1116
-#define PCI_VENDOR_ID_COMPUTERBOARDS   0x1307
-#define PCI_VENDOR_ID_ADVANTECH                0x13fe
-#define PCI_VENDOR_ID_RTD              0x1435
-#define PCI_VENDOR_ID_AMPLICON         0x14dc
 #define PCI_VENDOR_ID_ADLINK           0x144a
 #define PCI_VENDOR_ID_ICP              0x104c
 #define PCI_VENDOR_ID_CONTEC           0x1221
-#define PCI_VENDOR_ID_MEILHAUS         0x1402
 
 #define COMEDI_NUM_MINORS 0x100
 #define COMEDI_NUM_BOARD_MINORS 0x30
@@ -132,7 +68,7 @@ struct comedi_subdevice {
        struct comedi_device *device;
        int type;
        int n_chan;
-       volatile int subdev_flags;
+       int subdev_flags;
        int len_chanlist;       /* maximum length of channel/gain list */
 
        void *private;
@@ -293,7 +229,7 @@ struct comedi_device {
 
        struct fasync_struct *async_queue;
 
-       void (*open) (struct comedi_device *dev);
+       int (*open) (struct comedi_device *dev);
        void (*close) (struct comedi_device *dev);
 };
 
@@ -359,9 +295,6 @@ void cleanup_polling(void);
 void start_polling(struct comedi_device *);
 void stop_polling(struct comedi_device *);
 
-int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
-                    unsigned long new_size);
-
 #ifdef CONFIG_PROC_FS
 void comedi_proc_init(void);
 void comedi_proc_cleanup(void);
@@ -385,24 +318,17 @@ enum subdevice_runflags {
        SRF_RUNNING = 0x08000000
 };
 
-/*
-   various internal comedi functions
- */
-
-int do_rangeinfo_ioctl(struct comedi_device *dev, struct comedi_rangeinfo *arg);
-int check_chanlist(struct comedi_subdevice *s, int n, unsigned int *chanlist);
-void comedi_set_subdevice_runflags(struct comedi_subdevice *s, unsigned mask,
-                                  unsigned bits);
+int comedi_check_chanlist(struct comedi_subdevice *s,
+                         int n,
+                         unsigned int *chanlist);
 unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s);
-int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s,
-              struct comedi_insn *insn, unsigned int *data);
 
 /* range stuff */
 
 #define RANGE(a, b)            {(a)*1e6, (b)*1e6, 0}
 #define RANGE_ext(a, b)                {(a)*1e6, (b)*1e6, RF_EXTERNAL}
 #define RANGE_mA(a, b)         {(a)*1e6, (b)*1e6, UNIT_mA}
-#define RANGE_unitless(a, b)   {(a)*1e6, (b)*1e6, 0}   /* XXX */
+#define RANGE_unitless(a, b)   {(a)*1e6, (b)*1e6, 0}
 #define BIP_RANGE(a)           {-(a)*1e6, (a)*1e6, 0}
 #define UNI_RANGE(a)           {0, (a)*1e6, 0}
 
@@ -505,8 +431,6 @@ static inline unsigned comedi_buf_read_n_allocated(struct comedi_async *async)
        return async->buf_read_alloc_count - async->buf_read_count;
 }
 
-void comedi_reset_async_buf(struct comedi_async *async);
-
 static inline void *comedi_aux_data(int options[], int n)
 {
        unsigned long address;
@@ -532,8 +456,6 @@ static inline void *comedi_aux_data(int options[], int n)
        return (void *)address;
 }
 
-int comedi_alloc_board_minor(struct device *hardware_device);
-void comedi_free_board_minor(unsigned minor);
 int comedi_alloc_subdevice_minor(struct comedi_device *dev,
                                 struct comedi_subdevice *s);
 void comedi_free_subdevice_minor(struct comedi_subdevice *s);