Staging: comedi: Remove pcmmio_private typedef

[safe/jmp/linux-2.6] / drivers / staging / comedi / comedidev.h

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 4333139..ea31936 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -155,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 *); */
@@ -221,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;
 
@@ -239,7 +239,7 @@ struct comedi_driver {
 
        const char *driver_name;
        struct module *module;
-       int (*attach) (struct comedi_device *, comedi_devconfig *);
+       int (*attach) (struct comedi_device *, struct comedi_devconfig *);
        int (*detach) (struct comedi_device *);
 
        /* number of elements in board_name and board_id arrays */
@@ -337,7 +337,7 @@ static inline struct comedi_subdevice *comedi_get_write_subdevice(
 }
 
 void comedi_device_detach(struct comedi_device *dev);
-int comedi_device_attach(struct comedi_device *dev, comedi_devconfig *it);
+int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it);
 int comedi_driver_register(struct comedi_driver *);
 int comedi_driver_unregister(struct comedi_driver *);
 
@@ -375,13 +375,13 @@ enum subdevice_runflags {
    various internal comedi functions
  */
 
-int do_rangeinfo_ioctl(struct comedi_device *dev, comedi_rangeinfo *arg);
+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);
 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 */
 
@@ -409,7 +409,7 @@ extern const struct comedi_lrange range_unknown;
 
 struct comedi_lrange {
        int length;
-       comedi_krange range[GCC_ZERO_LENGTH_ARRAY];
+       struct comedi_krange range[GCC_ZERO_LENGTH_ARRAY];
 };
 
 /* some silly little inline functions */