drm/nouveau: rename "argv" to what it represents in *rm_{alloc, ctrl}_*()

The name "argv" has different meanings in different functions.

To improve the readability, it's better to refine it to a name that
reflects what it represents.

Rename "argv" to what it represents. Wrap the long container_of() into
to_payload_header() to denote a clear meaning and make checkpatch.pl
happy.

No functional change is intended.

Signed-off-by: Zhi Wang <zhiw@nvidia.com>
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20250124182958.2040494-6-zhiw@nvidia.com
This commit is contained in:
Zhi Wang 2025-01-24 10:29:48 -08:00 committed by Danilo Krummrich
parent a15b537976
commit 0c2f211b66

View File

@ -126,6 +126,9 @@ struct r535_gsp_msg {
#define to_gsp_hdr(p, header) \
container_of((void *)p, typeof(*header), data)
#define to_payload_hdr(p, header) \
container_of((void *)p, typeof(*header), params)
static int
r535_rpc_status_to_errno(uint32_t rpc_status)
{
@ -639,17 +642,17 @@ r535_gsp_rpc_rm_free(struct nvkm_gsp_object *object)
}
static void
r535_gsp_rpc_rm_alloc_done(struct nvkm_gsp_object *object, void *repv)
r535_gsp_rpc_rm_alloc_done(struct nvkm_gsp_object *object, void *params)
{
rpc_gsp_rm_alloc_v03_00 *rpc = container_of(repv, typeof(*rpc), params);
rpc_gsp_rm_alloc_v03_00 *rpc = to_payload_hdr(params, rpc);
nvkm_gsp_rpc_done(object->client->gsp, rpc);
}
static void *
r535_gsp_rpc_rm_alloc_push(struct nvkm_gsp_object *object, void *argv)
r535_gsp_rpc_rm_alloc_push(struct nvkm_gsp_object *object, void *params)
{
rpc_gsp_rm_alloc_v03_00 *rpc = container_of(argv, typeof(*rpc), params);
rpc_gsp_rm_alloc_v03_00 *rpc = to_payload_hdr(params, rpc);
struct nvkm_gsp *gsp = object->client->gsp;
void *ret = NULL;
@ -692,25 +695,25 @@ r535_gsp_rpc_rm_alloc_get(struct nvkm_gsp_object *object, u32 oclass, u32 argc)
}
static void
r535_gsp_rpc_rm_ctrl_done(struct nvkm_gsp_object *object, void *repv)
r535_gsp_rpc_rm_ctrl_done(struct nvkm_gsp_object *object, void *params)
{
rpc_gsp_rm_control_v03_00 *rpc = container_of(repv, typeof(*rpc), params);
rpc_gsp_rm_control_v03_00 *rpc = to_payload_hdr(params, rpc);
if (!repv)
if (!params)
return;
nvkm_gsp_rpc_done(object->client->gsp, rpc);
}
static int
r535_gsp_rpc_rm_ctrl_push(struct nvkm_gsp_object *object, void **argv, u32 repc)
r535_gsp_rpc_rm_ctrl_push(struct nvkm_gsp_object *object, void **params, u32 repc)
{
rpc_gsp_rm_control_v03_00 *rpc = container_of((*argv), typeof(*rpc), params);
rpc_gsp_rm_control_v03_00 *rpc = to_payload_hdr((*params), rpc);
struct nvkm_gsp *gsp = object->client->gsp;
int ret = 0;
rpc = nvkm_gsp_rpc_push(gsp, rpc, true, repc);
if (IS_ERR_OR_NULL(rpc)) {
*argv = NULL;
*params = NULL;
return PTR_ERR(rpc);
}
@ -722,7 +725,7 @@ r535_gsp_rpc_rm_ctrl_push(struct nvkm_gsp_object *object, void **argv, u32 repc)
}
if (repc)
*argv = rpc->params;
*params = rpc->params;
else
nvkm_gsp_rpc_done(gsp, rpc);