From: Pedro Perez <pedropz1537@gmail.com>
To: gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev
Subject: [PATCH] staging: vme_user: vme_bridge.h: Name function pointer arguments
Date: Wed, 23 Oct 2024 15:04:39 -0500 [thread overview]
Message-ID: <20241023150439.4a0dbc05@hob> (raw)
This patch names the function pointer arguments in vme_bridge
consistently with the implementations.
Signed-off-by: Pedro Perez <pedropz1537@gmail.com>
---
drivers/staging/vme_user/vme_bridge.h | 56 ++++++++++++++++-----------
1 file changed, 33 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/vme_user/vme_bridge.h b/drivers/staging/vme_user/vme_bridge.h
index 9bdc41bb6602..abf880d68b12 100644
--- a/drivers/staging/vme_user/vme_bridge.h
+++ b/drivers/staging/vme_user/vme_bridge.h
@@ -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);
--
2.46.1
reply other threads:[~2024-10-23 20:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241023150439.4a0dbc05@hob \
--to=pedropz1537@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.