Staging: comedi: Remove comedi_insn typedef

[deliverable/linux.git] / drivers / staging / comedi / comedidev.h

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 3f9b2d027168610bf064fb10ed7095a2e8e3ea61..36dd82299c0ab83c647587b981a645de7eda237c 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -121,8 +121,6 @@
 #define COMEDI_NUM_BOARD_MINORS 0x30
 #define COMEDI_FIRST_SUBDEVICE_MINOR COMEDI_NUM_BOARD_MINORS
 
-typedef struct device device_create_result_type;
-
 #define COMEDI_DEVICE_CREATE(cs, parent, devt, drvdata, device, fmt...) \
        device_create(cs, ((parent) ? (parent) : (device)), devt, drvdata, fmt)
 
@@ -157,17 +155,17 @@ struct comedi_subdevice {
 
        unsigned int *chanlist; /* driver-owned chanlist (not used) */
 
-       int (*insn_read) (struct comedi_device *, struct comedi_subdevice *, comedi_insn *,
+       int (*insn_read) (struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *,
                unsigned int *);
-       int (*insn_write) (struct comedi_device *, struct comedi_subdevice *, comedi_insn *,
+       int (*insn_write) (struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *,
                unsigned int *);
-       int (*insn_bits) (struct comedi_device *, struct comedi_subdevice *, comedi_insn *,
+       int (*insn_bits) (struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *,
                unsigned int *);
-       int (*insn_config) (struct comedi_device *, struct comedi_subdevice *, comedi_insn *,
+       int (*insn_config) (struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *,
                unsigned int *);
 
        int (*do_cmd) (struct comedi_device *, struct comedi_subdevice *);
-       int (*do_cmdtest) (struct comedi_device *, struct comedi_subdevice *, comedi_cmd *);
+       int (*do_cmdtest) (struct comedi_device *, struct comedi_subdevice *, struct comedi_cmd *);
        int (*poll) (struct comedi_device *, struct comedi_subdevice *);
        int (*cancel) (struct comedi_device *, struct comedi_subdevice *);
        /* int (*do_lock)(struct comedi_device *,struct comedi_subdevice *); */
@@ -183,7 +181,7 @@ struct comedi_subdevice {
 
        unsigned int state;
 
-       device_create_result_type *class_dev;
+       struct device *class_dev;
        int minor;
 };
 
@@ -223,7 +221,7 @@ struct comedi_async {
 
        unsigned int events;    /* events that have occurred */
 
-       comedi_cmd cmd;
+       struct comedi_cmd cmd;
 
        wait_queue_head_t wait_head;
 
@@ -256,7 +254,7 @@ struct comedi_device {
        struct comedi_driver *driver;
        void *private;
 
-       device_create_result_type *class_dev;
+       struct device *class_dev;
        int minor;
        /* hw_dev is passed to dma_alloc_coherent when allocating async buffers
         * for subdevices that have async_dma_dir set to something other than
@@ -383,7 +381,7 @@ void comedi_set_subdevice_runflags(struct comedi_subdevice *s, unsigned mask,
        unsigned bits);
 unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s);
 int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s,
-       comedi_insn *insn, unsigned int *data);
+       struct comedi_insn *insn, unsigned int *data);
 
 /* range stuff */