drm/bochs: drop unused gpu_addr arg from bochs_bo_pin()

It's always NULL, so just remove it.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20190111053752.4004-12-kraxel@redhat.com

diff --git a/drivers/gpu/drm/bochs/bochs.h b/drivers/gpu/drm/bochs/bochs.h
index 4dc1b6384eaa19c83ba88fb110eafd4c962e934d..d0d474e06fa7b14b1adfe122d05551af070c69dc 100644 (file)
--- 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 d9f3d42999946340706c68b4684ff049ae671356..92feb817fffb7990225f800fadf0deb96fd603a8 100644 (file)
--- 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 5b7e1a7c6bff3507595e389811a2b770f7fc1893..f663c54185bb1f27e8a1bbdbff128d7ad733945d 100644 (file)
--- a/drivers/gpu/drm/bochs/bochs_kms.c
+++ b/drivers/gpu/drm/bochs/bochs_kms.c
@@ -101,7 +101,7 @@ static int bochs_plane_prepare_fb(struct drm_plane *plane,
        ret = ttm_bo_reserve(&bo->bo, true, false, NULL);
        if (ret)
                return ret;
-       ret = bochs_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL);
+       ret = bochs_bo_pin(bo, TTM_PL_FLAG_VRAM);
        ttm_bo_unreserve(&bo->bo);
        return ret;
 }

diff --git a/drivers/gpu/drm/bochs/bochs_mm.c b/drivers/gpu/drm/bochs/bochs_mm.c
index 0980411e41bf0d7d61fa173b4199253795aa2966..5a0e092847ab2277007044aa0fe723bbc618ba80 100644 (file)
--- 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;
 }