Re: [PATCH 10/14] drm/bochs: drop unused gpu_addr arg from bochs_bo_pin()

[Oleksandr Andrushchenko]

On 12/19/18 1:51 PM, Gerd Hoffmann wrote:

It's always NULL, so just remove it.

Signed-off-by: Gerd Hoffmann <kra...@redhat.com>

Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushche...@epam.com>

---
  drivers/gpu/drm/bochs/bochs.h       |  2 +-
  drivers/gpu/drm/bochs/bochs_fbdev.c |  2 +-
  drivers/gpu/drm/bochs/bochs_kms.c   |  2 +-
  drivers/gpu/drm/bochs/bochs_mm.c    | 11 +----------
  4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/bochs/bochs.h b/drivers/gpu/drm/bochs/bochs.h
index 4dc1b6384e..d0d474e06f 100644
--- a/drivers/gpu/drm/bochs/bochs.h
+++ b/drivers/gpu/drm/bochs/bochs.h
@@ -142,7 +142,7 @@ int bochs_dumb_create(struct drm_file *file, struct 
drm_device *dev,
  int bochs_dumb_mmap_offset(struct drm_file *file, struct drm_device *dev,
                           uint32_t handle, uint64_t *offset);

-int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag, u64 *gpu_addr);

+int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag);
  int bochs_bo_unpin(struct bochs_bo *bo);

/* bochs_kms.c */

diff --git a/drivers/gpu/drm/bochs/bochs_fbdev.c 
b/drivers/gpu/drm/bochs/bochs_fbdev.c
index d9f3d42999..92feb817ff 100644
--- a/drivers/gpu/drm/bochs/bochs_fbdev.c
+++ b/drivers/gpu/drm/bochs/bochs_fbdev.c
@@ -81,7 +81,7 @@ static int bochsfb_create(struct drm_fb_helper *helper,
        if (ret)
                return ret;

- ret = bochs_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL);

+       ret = bochs_bo_pin(bo, TTM_PL_FLAG_VRAM);
        if (ret) {
                DRM_ERROR("failed to pin fbcon\n");
                ttm_bo_unreserve(&bo->bo);
diff --git a/drivers/gpu/drm/bochs/bochs_kms.c 
b/drivers/gpu/drm/bochs/bochs_kms.c
index 85dd268fa1..a1a0129f3e 100644
--- a/drivers/gpu/drm/bochs/bochs_kms.c
+++ b/drivers/gpu/drm/bochs/bochs_kms.c
@@ -96,7 +96,7 @@ static int bochs_plane_prepare_fb(struct drm_plane *plane,
        if (!new_state->fb)
                return 0;
        bo = gem_to_bochs_bo(new_state->fb->obj[0]);
-       return bochs_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL);
+       return bochs_bo_pin(bo, TTM_PL_FLAG_VRAM);
  }

static void bochs_plane_cleanup_fb(struct drm_plane *plane,

diff --git a/drivers/gpu/drm/bochs/bochs_mm.c b/drivers/gpu/drm/bochs/bochs_mm.c
index 0980411e41..5a0e092847 100644
--- a/drivers/gpu/drm/bochs/bochs_mm.c
+++ b/drivers/gpu/drm/bochs/bochs_mm.c
@@ -210,20 +210,13 @@ static void bochs_ttm_placement(struct bochs_bo *bo, int 
domain)
        bo->placement.num_busy_placement = c;
  }

-static inline u64 bochs_bo_gpu_offset(struct bochs_bo *bo)

-{
-       return bo->bo.offset;
-}
-
-int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag, u64 *gpu_addr)
+int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag)
  {
        struct ttm_operation_ctx ctx = { false, false };
        int i, ret;

if (bo->pin_count) {

                bo->pin_count++;
-               if (gpu_addr)
-                       *gpu_addr = bochs_bo_gpu_offset(bo);
                return 0;
        }

@@ -235,8 +228,6 @@ int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag, u64 *gpu_addr)

                return ret;

bo->pin_count = 1;

-       if (gpu_addr)
-               *gpu_addr = bochs_bo_gpu_offset(bo);
        return 0;
  }