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 83c45a6..ea31936 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -121,10 +121,6 @@
 #define COMEDI_NUM_BOARD_MINORS 0x30
 #define COMEDI_FIRST_SUBDEVICE_MINOR COMEDI_NUM_BOARD_MINORS
 
-typedef struct comedi_lrange_struct comedi_lrange;
-
-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)
 
@@ -154,22 +150,22 @@ struct comedi_subdevice {
 
        unsigned int settling_time_0;
 
-       const comedi_lrange *range_table;
-       const comedi_lrange *const *range_table_list;
+       const struct comedi_lrange *range_table;
+       const struct comedi_lrange *const *range_table_list;
 
        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 *); */
@@ -185,7 +181,7 @@ struct comedi_subdevice {
 
        unsigned int state;
 
-       device_create_result_type *class_dev;
+       struct device *class_dev;
        int minor;
 };
 
@@ -225,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;
 
@@ -243,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 */
@@ -258,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
@@ -341,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 *);
 
@@ -379,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 */
 
@@ -396,12 +392,12 @@ int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s,
 #define BIP_RANGE(a)           {-(a)*1e6, (a)*1e6, 0}
 #define UNI_RANGE(a)           {0, (a)*1e6, 0}
 
-extern const comedi_lrange range_bipolar10;
-extern const comedi_lrange range_bipolar5;
-extern const comedi_lrange range_bipolar2_5;
-extern const comedi_lrange range_unipolar10;
-extern const comedi_lrange range_unipolar5;
-extern const comedi_lrange range_unknown;
+extern const struct comedi_lrange range_bipolar10;
+extern const struct comedi_lrange range_bipolar5;
+extern const struct comedi_lrange range_bipolar2_5;
+extern const struct comedi_lrange range_unipolar10;
+extern const struct comedi_lrange range_unipolar5;
+extern const struct comedi_lrange range_unknown;
 
 #define range_digital          range_unipolar5
 
@@ -411,9 +407,9 @@ extern const comedi_lrange range_unknown;
 #define GCC_ZERO_LENGTH_ARRAY 0
 #endif
 
-struct comedi_lrange_struct {
+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 */