Merge git://www.linux-watchdog.org/linux-watchdog

[cascardo/linux.git] / drivers / staging / vme / vme_bridge.h

diff --git a/drivers/staging/vme/vme_bridge.h b/drivers/staging/vme/vme_bridge.h
index c2deda2..934949a 100644 (file)
--- a/drivers/staging/vme/vme_bridge.h
+++ b/drivers/staging/vme/vme_bridge.h
@@ -15,9 +15,9 @@ struct vme_master_resource {
        spinlock_t lock;
        int locked;
        int number;
-       vme_address_t address_attr;
-       vme_cycle_t cycle_attr;
-       vme_width_t width_attr;
+       u32 address_attr;
+       u32 cycle_attr;
+       u32 width_attr;
        struct resource bus_resource;
        void __iomem *kern_base;
 };
@@ -28,13 +28,13 @@ struct vme_slave_resource {
        struct mutex mtx;
        int locked;
        int number;
-       vme_address_t address_attr;
-       vme_cycle_t cycle_attr;
+       u32 address_attr;
+       u32 cycle_attr;
 };
 
 struct vme_dma_pattern {
        u32 pattern;
-       vme_pattern_t type;
+       u32 type;
 };
 
 struct vme_dma_pci {
@@ -43,9 +43,9 @@ struct vme_dma_pci {
 
 struct vme_dma_vme {
        unsigned long long address;
-       vme_address_t aspace;
-       vme_cycle_t cycle;
-       vme_width_t dwidth;
+       u32 aspace;
+       u32 cycle;
+       u32 dwidth;
 };
 
 struct vme_dma_list {
@@ -63,7 +63,7 @@ struct vme_dma_resource {
        int number;
        struct list_head pending;
        struct list_head running;
-       vme_dma_route_t route_attr;
+       u32 route_attr;
 };
 
 struct vme_lm_resource {
@@ -122,17 +122,16 @@ struct vme_bridge {
        /* Slave Functions */
        int (*slave_get) (struct vme_slave_resource *, int *,
                unsigned long long *, unsigned long long *, dma_addr_t *,
-               vme_address_t *, vme_cycle_t *);
+               u32 *, u32 *);
        int (*slave_set) (struct vme_slave_resource *, int, unsigned long long,
-               unsigned long long, dma_addr_t, vme_address_t, vme_cycle_t);
+               unsigned long long, dma_addr_t, u32, u32);
 
        /* Master Functions */
        int (*master_get) (struct vme_master_resource *, int *,
-               unsigned long long *, unsigned long long *, vme_address_t *,
-               vme_cycle_t *, vme_width_t *);
+               unsigned long long *, unsigned long long *, u32 *, u32 *,
+               u32 *);
        int (*master_set) (struct vme_master_resource *, int,
-               unsigned long long, unsigned long long,  vme_address_t,
-               vme_cycle_t, vme_width_t);
+               unsigned long long, unsigned long long,  u32, u32, u32);
        ssize_t (*master_read) (struct vme_master_resource *, void *, size_t,
                loff_t);
        ssize_t (*master_write) (struct vme_master_resource *, void *, size_t,
@@ -151,10 +150,9 @@ struct vme_bridge {
        int (*irq_generate) (struct vme_bridge *, int, int);
 
        /* Location monitor functions */
-       int (*lm_set) (struct vme_lm_resource *, unsigned long long,
-               vme_address_t, vme_cycle_t);
-       int (*lm_get) (struct vme_lm_resource *, unsigned long long *,
-               vme_address_t *, vme_cycle_t *);
+       int (*lm_set) (struct vme_lm_resource *, unsigned long long, u32, u32);
+       int (*lm_get) (struct vme_lm_resource *, unsigned long long *, u32 *,
+               u32 *);
        int (*lm_attach) (struct vme_lm_resource *, int, void (*callback)(int));
        int (*lm_detach) (struct vme_lm_resource *, int);