The `size` argument in the `qxl_alloc_release_reserved` function is
currently unused and has no effect on the function's logic. So remove
this argument to clean up the code. No functional changes are expected.
Signed-off-by: Ryosuke Yasuoka <ryasu...@redhat.com>
---
drivers/gpu/drm/qxl/qxl_display.c | 9 +++------
drivers/gpu/drm/qxl/qxl_draw.c | 3 +--
drivers/gpu/drm/qxl/qxl_drv.h | 5 ++---
drivers/gpu/drm/qxl/qxl_ioctl.c | 7 +------
drivers/gpu/drm/qxl/qxl_release.c | 8 +++-----
5 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/qxl/qxl_display.c
b/drivers/gpu/drm/qxl/qxl_display.c
index 70aff64ced87..c0c65efbfa32 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -496,8 +496,7 @@ static int qxl_primary_apply_cursor(struct qxl_device *qdev,
if (!qcrtc->cursor_bo)
return 0;
- ret = qxl_alloc_release_reserved(qdev, sizeof(*cmd),
- QXL_RELEASE_CURSOR_CMD,
+ ret = qxl_alloc_release_reserved(qdev, QXL_RELEASE_CURSOR_CMD,
&release, NULL);
if (ret)
return ret;
@@ -541,8 +540,7 @@ static int qxl_primary_move_cursor(struct qxl_device *qdev,
if (!qcrtc->cursor_bo)
return 0;
- ret = qxl_alloc_release_reserved(qdev, sizeof(*cmd),
- QXL_RELEASE_CURSOR_CMD,
+ ret = qxl_alloc_release_reserved(qdev, QXL_RELEASE_CURSOR_CMD,
&release, NULL);
if (ret)
return ret;
@@ -714,8 +712,7 @@ static void qxl_cursor_atomic_disable(struct drm_plane
*plane,
struct qxl_cursor_cmd *cmd;
int ret;
- ret = qxl_alloc_release_reserved(qdev, sizeof(*cmd),
- QXL_RELEASE_CURSOR_CMD,
+ ret = qxl_alloc_release_reserved(qdev, QXL_RELEASE_CURSOR_CMD,
&release, NULL);
if (ret)
return;
diff --git a/drivers/gpu/drm/qxl/qxl_draw.c b/drivers/gpu/drm/qxl/qxl_draw.c
index 3a3e127ce297..b4c41545fb06 100644
--- a/drivers/gpu/drm/qxl/qxl_draw.c
+++ b/drivers/gpu/drm/qxl/qxl_draw.c
@@ -64,8 +64,7 @@ static struct qxl_rect *drawable_set_clipping(struct
qxl_device *qdev,
static int
alloc_drawable(struct qxl_device *qdev, struct qxl_release **release)
{
- return qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable),
- QXL_RELEASE_DRAWABLE, release, NULL);
+ return qxl_alloc_release_reserved(qdev, QXL_RELEASE_DRAWABLE, release,
NULL);
}
static void
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index cc02b5f10ad9..fbc15338ae3c 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -372,9 +372,8 @@ int qxl_alloc_surface_release_reserved(struct qxl_device
*qdev,
enum qxl_surface_cmd_type
surface_cmd_type,
struct qxl_release *create_rel,
struct qxl_release **release);
-int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size,
- int type, struct qxl_release **release,
- struct qxl_bo **rbo);
+int qxl_alloc_release_reserved(struct qxl_device *qdev, int type,
+ struct qxl_release **release, struct qxl_bo
**rbo);
int
qxl_push_command_ring_release(struct qxl_device *qdev, struct qxl_release
*release,
diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
index 506ae1f5e099..5e0321b6f319 100644
--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
@@ -171,12 +171,7 @@ static int qxl_process_single_command(struct qxl_device
*qdev,
if (!reloc_info)
return -ENOMEM;
- ret = qxl_alloc_release_reserved(qdev,
- sizeof(union qxl_release_info) +
- cmd->command_size,
- release_type,
- &release,
- &cmd_bo);
+ ret = qxl_alloc_release_reserved(qdev, release_type, &release, &cmd_bo);
if (ret)
goto out_free_reloc;
diff --git a/drivers/gpu/drm/qxl/qxl_release.c
b/drivers/gpu/drm/qxl/qxl_release.c
index 05204a6a3fa8..52c444a482be 100644
--- a/drivers/gpu/drm/qxl/qxl_release.c
+++ b/drivers/gpu/drm/qxl/qxl_release.c
@@ -279,13 +279,11 @@ int qxl_alloc_surface_release_reserved(struct qxl_device
*qdev,
return 0;
}
- return qxl_alloc_release_reserved(qdev, sizeof(struct qxl_surface_cmd),
- QXL_RELEASE_SURFACE_CMD, release,
NULL);
+ return qxl_alloc_release_reserved(qdev, QXL_RELEASE_SURFACE_CMD,
release, NULL);
}
-int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size,
- int type, struct qxl_release **release,
- struct qxl_bo **rbo)
+int qxl_alloc_release_reserved(struct qxl_device *qdev, int type,
+ struct qxl_release **release, struct qxl_bo
**rbo)
{
struct qxl_bo *bo, *free_bo = NULL;
int idr_ret;
base-commit: e48e99b6edf41c69c5528aa7ffb2daf3c59ee105
--
2.48.1
