staging: vme_user: vme_bridge.h: Name function pointer arguments
PATCH 1/1 staging: vme_user: vme_bridge.h: Name function pointer arguments
This patch names the function pointer arguments in vme_bridge consistently with the implementations.
Signed-off-by Pedro Perez <[email protected]>
--- drivers/staging/vme_user/vme_bridge.h | 56 ++++++++++++++++----------- 1 file changed, 33 insertions(+), 23 deletions(-)
drivers/staging/vme_user/vme_bridge.h +33 -23
@@ -128,39 +128,49 @@ 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_set)(struct vme_slave_resource *,int ,unsigned long long , -unsigned long long ,dma_addr_t ,u32 ,u32 ); +int (*slave_get)(struct vme_slave_resource *image,int *enabled, +unsigned long long *vme_base,unsigned long long *size, +dma_addr_t *buf_base,u32 *aspace,u32 *cycle); +int (*slave_set)(struct vme_slave_resource *image,int enabled, +unsigned long long vme_base,unsigned long long size, +dma_addr_t buf_base,u32 aspace,u32 cycle);/* 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 ); -unsigned int (*master_rmw)(struct vme_master_resource *,unsigned int , -unsigned int ,unsigned int ,loff_t ); +int (*master_get)(struct vme_master_resource *image,int *enabled, +unsigned long long *vme_base,unsigned long long *size, +u32 *aspace,u32 *cycle,u32 *dwidth); +int (*master_set)(struct vme_master_resource *image,int enabled, +unsigned long long vme_base,unsigned long long size, +u32 aspace,u32 cycle,u32 dwidth); +ssize_t (*master_read)(struct vme_master_resource *image,void *buf, +size_t count,loff_t offset); +ssize_t (*master_write)(struct vme_master_resource *image,void *buf, +size_t count,loff_t offset); +unsigned int (*master_rmw)(struct vme_master_resource *image, +unsigned int mask,unsigned int compare, +unsigned int swap,loff_t offset);/* DMA Functions */ -int (*dma_list_add)(struct vme_dma_list *,struct vme_dma_attr *, -struct vme_dma_attr *,size_t ); -int (*dma_list_exec)(struct vme_dma_list *); -int (*dma_list_empty)(struct vme_dma_list *); +int (*dma_list_add)(struct vme_dma_list *list,struct vme_dma_attr *src, +struct vme_dma_attr *dest,size_t count); +int (*dma_list_exec)(struct vme_dma_list *list); +int (*dma_list_empty)(struct vme_dma_list *list);/* Interrupt Functions */ -void (*irq_set)(struct vme_bridge *,int ,int ,int ); -int (*irq_generate)(struct vme_bridge *,int ,int ); +void (*irq_set)(struct vme_bridge *bridge,int level,int state,int sync); +int (*irq_generate)(struct vme_bridge *bridge,int level,int statid);/* 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_detach)(struct vme_lm_resource *,int ); +int (*lm_set)(struct vme_lm_resource *lm,unsigned long long lm_base, +u32 aspace,u32 cycle); +int (*lm_get)(struct vme_lm_resource *lm,unsigned long long *lm_base, +u32 *aspace,u32 *cycle); +int (*lm_attach)(struct vme_lm_resource *lm,int monitor, +void (*callback)(void *),void *data); +int (*lm_detach)(struct vme_lm_resource *lm,int monitor);/* CR/CSR space functions */ -int (*slot_get)(struct vme_bridge *); +int (*slot_get)(struct vme_bridge *bridge);/* Bridge parent interface */ void *(*alloc_consistent)(struct device *dev,size_t size,dma_addr_t *dma);
Signature · 1 line
2.46.1