tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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 <pedropz1537@gmail.com>
Link: https://lore.kernel.org/r/20241023150439.4a0dbc05@hob
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Pedro Perez and committed by
Greg Kroah-Hartman 39dace70 5300c32d

+33 -23
+33 -23
drivers/staging/vme_user/vme_bridge.h
··· 128 128 struct mutex irq_mtx; 129 129 130 130 /* Slave Functions */ 131 - int (*slave_get)(struct vme_slave_resource *, int *, unsigned long long *, 132 - unsigned long long *, dma_addr_t *, u32 *, u32 *); 133 - int (*slave_set)(struct vme_slave_resource *, int, unsigned long long, 134 - unsigned long long, dma_addr_t, u32, u32); 131 + int (*slave_get)(struct vme_slave_resource *image, int *enabled, 132 + unsigned long long *vme_base, unsigned long long *size, 133 + dma_addr_t *buf_base, u32 *aspace, u32 *cycle); 134 + int (*slave_set)(struct vme_slave_resource *image, int enabled, 135 + unsigned long long vme_base, unsigned long long size, 136 + dma_addr_t buf_base, u32 aspace, u32 cycle); 135 137 136 138 /* Master Functions */ 137 - int (*master_get)(struct vme_master_resource *, int *, unsigned long long *, 138 - unsigned long long *, u32 *, u32 *, u32 *); 139 - int (*master_set)(struct vme_master_resource *, int, unsigned long long, 140 - unsigned long long, u32, u32, u32); 141 - ssize_t (*master_read)(struct vme_master_resource *, void *, size_t, loff_t); 142 - ssize_t (*master_write)(struct vme_master_resource *, void *, size_t, loff_t); 143 - unsigned int (*master_rmw)(struct vme_master_resource *, unsigned int, 144 - unsigned int, unsigned int, loff_t); 139 + int (*master_get)(struct vme_master_resource *image, int *enabled, 140 + unsigned long long *vme_base, unsigned long long *size, 141 + u32 *aspace, u32 *cycle, u32 *dwidth); 142 + int (*master_set)(struct vme_master_resource *image, int enabled, 143 + unsigned long long vme_base, unsigned long long size, 144 + u32 aspace, u32 cycle, u32 dwidth); 145 + ssize_t (*master_read)(struct vme_master_resource *image, void *buf, 146 + size_t count, loff_t offset); 147 + ssize_t (*master_write)(struct vme_master_resource *image, void *buf, 148 + size_t count, loff_t offset); 149 + unsigned int (*master_rmw)(struct vme_master_resource *image, 150 + unsigned int mask, unsigned int compare, 151 + unsigned int swap, loff_t offset); 145 152 146 153 /* DMA Functions */ 147 - int (*dma_list_add)(struct vme_dma_list *, struct vme_dma_attr *, 148 - struct vme_dma_attr *, size_t); 149 - int (*dma_list_exec)(struct vme_dma_list *); 150 - int (*dma_list_empty)(struct vme_dma_list *); 154 + int (*dma_list_add)(struct vme_dma_list *list, struct vme_dma_attr *src, 155 + struct vme_dma_attr *dest, size_t count); 156 + int (*dma_list_exec)(struct vme_dma_list *list); 157 + int (*dma_list_empty)(struct vme_dma_list *list); 151 158 152 159 /* Interrupt Functions */ 153 - void (*irq_set)(struct vme_bridge *, int, int, int); 154 - int (*irq_generate)(struct vme_bridge *, int, int); 160 + void (*irq_set)(struct vme_bridge *bridge, int level, int state, int sync); 161 + int (*irq_generate)(struct vme_bridge *bridge, int level, int statid); 155 162 156 163 /* Location monitor functions */ 157 - int (*lm_set)(struct vme_lm_resource *, unsigned long long, u32, u32); 158 - int (*lm_get)(struct vme_lm_resource *, unsigned long long *, u32 *, u32 *); 159 - int (*lm_attach)(struct vme_lm_resource *, int, void (*callback)(void *), void *); 160 - int (*lm_detach)(struct vme_lm_resource *, int); 164 + int (*lm_set)(struct vme_lm_resource *lm, unsigned long long lm_base, 165 + u32 aspace, u32 cycle); 166 + int (*lm_get)(struct vme_lm_resource *lm, unsigned long long *lm_base, 167 + u32 *aspace, u32 *cycle); 168 + int (*lm_attach)(struct vme_lm_resource *lm, int monitor, 169 + void (*callback)(void *), void *data); 170 + int (*lm_detach)(struct vme_lm_resource *lm, int monitor); 161 171 162 172 /* CR/CSR space functions */ 163 - int (*slot_get)(struct vme_bridge *); 173 + int (*slot_get)(struct vme_bridge *bridge); 164 174 165 175 /* Bridge parent interface */ 166 176 void *(*alloc_consistent)(struct device *dev, size_t size, dma_addr_t *dma);