diff options
Diffstat (limited to 'drivers/staging/vme_user')
-rw-r--r-- | drivers/staging/vme_user/vme_bridge.h | 46 |
1 files changed, 18 insertions, 28 deletions
diff --git a/drivers/staging/vme_user/vme_bridge.h b/drivers/staging/vme_user/vme_bridge.h index 11df0a5e7f7b..9bdc41bb6602 100644 --- a/drivers/staging/vme_user/vme_bridge.h +++ b/drivers/staging/vme_user/vme_bridge.h @@ -128,28 +128,24 @@ struct vme_bridge { struct mutex irq_mtx; /* Slave Functions */ - int (*slave_get)(struct vme_slave_resource *, int *, - unsigned long long *, unsigned long long *, dma_addr_t *, - u32 *, u32 *); + int (*slave_get)(struct vme_slave_resource *, int *, unsigned long long *, + unsigned long long *, dma_addr_t *, u32 *, u32 *); int (*slave_set)(struct vme_slave_resource *, int, unsigned long long, - unsigned long long, dma_addr_t, u32, u32); + unsigned long long, dma_addr_t, u32, u32); /* Master Functions */ - int (*master_get)(struct vme_master_resource *, int *, - unsigned long long *, unsigned long long *, u32 *, u32 *, - u32 *); - int (*master_set)(struct vme_master_resource *, int, - 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, - loff_t); + int (*master_get)(struct vme_master_resource *, int *, unsigned long long *, + unsigned long long *, u32 *, u32 *, u32 *); + int (*master_set)(struct vme_master_resource *, int, 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, loff_t); unsigned int (*master_rmw)(struct vme_master_resource *, unsigned int, - unsigned int, unsigned int, loff_t); + unsigned int, unsigned int, loff_t); /* DMA Functions */ int (*dma_list_add)(struct vme_dma_list *, struct vme_dma_attr *, - struct vme_dma_attr *, size_t); + struct vme_dma_attr *, size_t); int (*dma_list_exec)(struct vme_dma_list *); int (*dma_list_empty)(struct vme_dma_list *); @@ -159,32 +155,26 @@ struct vme_bridge { /* Location monitor functions */ 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)(void *), void *); + int (*lm_get)(struct vme_lm_resource *, unsigned long long *, u32 *, u32 *); + int (*lm_attach)(struct vme_lm_resource *, int, void (*callback)(void *), void *); int (*lm_detach)(struct vme_lm_resource *, int); /* CR/CSR space functions */ int (*slot_get)(struct vme_bridge *); /* Bridge parent interface */ - void *(*alloc_consistent)(struct device *dev, size_t size, - dma_addr_t *dma); - void (*free_consistent)(struct device *dev, size_t size, - void *vaddr, dma_addr_t dma); + void *(*alloc_consistent)(struct device *dev, size_t size, dma_addr_t *dma); + void (*free_consistent)(struct device *dev, size_t size, void *vaddr, dma_addr_t dma); }; -void vme_bus_error_handler(struct vme_bridge *bridge, - unsigned long long address, int am); +void vme_bus_error_handler(struct vme_bridge *bridge, unsigned long long address, int am); void vme_irq_handler(struct vme_bridge *, int, int); struct vme_bridge *vme_init_bridge(struct vme_bridge *); int vme_register_bridge(struct vme_bridge *); void vme_unregister_bridge(struct vme_bridge *); -struct vme_error_handler *vme_register_error_handler( - struct vme_bridge *bridge, u32 aspace, - unsigned long long address, size_t len); +struct vme_error_handler *vme_register_error_handler(struct vme_bridge *bridge, u32 aspace, + unsigned long long address, size_t len); void vme_unregister_error_handler(struct vme_error_handler *handler); #endif /* _VME_BRIDGE_H_ */ |