From d7c84fd88fb71f30c90d3d13bd8dfc2c2d2541da Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Tue, 16 Aug 2016 18:18:24 -0700 Subject: [PATCH] minigbm: Remove drv prefix from static backend functions It doesn't make sense to have the drv prefix for static backend functions, so remove it. TEST=minigbm still builds CQ-DEPEND=CL:370798 Change-Id: I65272162b8c7cf5d3716c7e5fcf0475c35522c47 Reviewed-on: https://chromium-review.googlesource.com/371501 Commit-Ready: Gurchetan Singh Tested-by: Gurchetan Singh Reviewed-by: Zach Reizner --- exynos.c | 7 +++---- i915.c | 19 +++++++++---------- mediatek.c | 11 +++++------ rockchip.c | 11 +++++------ tegra.c | 10 +++++----- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/exynos.c b/exynos.c index f1c0a32..3d58c02 100644 --- a/exynos.c +++ b/exynos.c @@ -17,9 +17,8 @@ #include "helpers.h" #include "util.h" -static int drv_exynos_bo_create(struct bo *bo, - uint32_t width, uint32_t height, - uint32_t format, uint32_t flags) +static int exynos_bo_create(struct bo *bo, uint32_t width, uint32_t height, + uint32_t format, uint32_t flags) { size_t plane; @@ -89,7 +88,7 @@ cleanup_planes: const struct backend backend_exynos = { .name = "exynos", - .bo_create = drv_exynos_bo_create, + .bo_create = exynos_bo_create, .bo_destroy = drv_gem_bo_destroy, .bo_map = drv_dumb_bo_map, .format_list = { diff --git a/i915.c b/i915.c index dbd3d67..dea920b 100644 --- a/i915.c +++ b/i915.c @@ -35,7 +35,7 @@ static int get_gen(int device_id) return 4; } -static int drv_i915_init(struct driver *drv) +static int i915_init(struct driver *drv) { struct i915_device *i915_drv; drm_i915_getparam_t get_param; @@ -63,7 +63,7 @@ static int drv_i915_init(struct driver *drv) return 0; } -static void drv_i915_close(struct driver *drv) +static void i915_close(struct driver *drv) { free(drv->priv); drv->priv = NULL; @@ -119,9 +119,8 @@ static int i915_verify_dimensions(struct driver *drv, uint32_t stride, return 1; } -static int drv_i915_bo_create(struct bo *bo, - uint32_t width, uint32_t height, - uint32_t format, uint32_t flags) +static int i915_bo_create(struct bo *bo, uint32_t width, uint32_t height, + uint32_t format, uint32_t flags) { struct driver *drv = bo->drv; int bpp = drv_stride_from_format(format, 1); @@ -184,7 +183,7 @@ static int drv_i915_bo_create(struct bo *bo, return 0; } -static void *drv_i915_bo_map(struct bo *bo) +static void *i915_bo_map(struct bo *bo) { int ret; struct drm_i915_gem_mmap_gtt gem_map; @@ -205,11 +204,11 @@ static void *drv_i915_bo_map(struct bo *bo) const struct backend backend_i915 = { .name = "i915", - .init = drv_i915_init, - .close = drv_i915_close, - .bo_create = drv_i915_bo_create, + .init = i915_init, + .close = i915_close, + .bo_create = i915_bo_create, .bo_destroy = drv_gem_bo_destroy, - .bo_map = drv_i915_bo_map, + .bo_map = i915_bo_map, .format_list = { {DRV_FORMAT_XRGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_RENDERING}, {DRV_FORMAT_XRGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR}, diff --git a/mediatek.c b/mediatek.c index b623f6f..8cf320d 100644 --- a/mediatek.c +++ b/mediatek.c @@ -15,9 +15,8 @@ #include "drv_priv.h" #include "helpers.h" -static int drv_mediatek_bo_create(struct bo *bo, - uint32_t width, uint32_t height, - uint32_t format, uint32_t flags) +static int mediatek_bo_create(struct bo *bo, uint32_t width, uint32_t height, + uint32_t format, uint32_t flags) { size_t size; struct drm_mtk_gem_create gem_create; @@ -43,7 +42,7 @@ static int drv_mediatek_bo_create(struct bo *bo, return 0; } -static void *drv_mediatek_bo_map(struct bo *bo) +static void *mediatek_bo_map(struct bo *bo) { int ret; struct drm_mtk_gem_map_off gem_map; @@ -64,9 +63,9 @@ static void *drv_mediatek_bo_map(struct bo *bo) const struct backend backend_mediatek = { .name = "mediatek", - .bo_create = drv_mediatek_bo_create, + .bo_create = mediatek_bo_create, .bo_destroy = drv_gem_bo_destroy, - .bo_map = drv_mediatek_bo_map, + .bo_map = mediatek_bo_map, .format_list = { {DRV_FORMAT_XRGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_RENDERING}, {DRV_FORMAT_XRGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR}, diff --git a/rockchip.c b/rockchip.c index c1d1620..82ebf34 100644 --- a/rockchip.c +++ b/rockchip.c @@ -18,9 +18,8 @@ #include "helpers.h" #include "util.h" -static int drv_rockchip_bo_create(struct bo *bo, - uint32_t width, uint32_t height, - uint32_t format, uint32_t flags) +static int rockchip_bo_create(struct bo *bo, uint32_t width, uint32_t height, + uint32_t format, uint32_t flags) { size_t plane; @@ -74,7 +73,7 @@ static int drv_rockchip_bo_create(struct bo *bo, return ret; } -static void *drv_rockchip_bo_map(struct bo *bo) +static void *rockchip_bo_map(struct bo *bo) { int ret; struct drm_rockchip_gem_map_off gem_map; @@ -97,9 +96,9 @@ static void *drv_rockchip_bo_map(struct bo *bo) const struct backend backend_rockchip = { .name = "rockchip", - .bo_create = drv_rockchip_bo_create, + .bo_create = rockchip_bo_create, .bo_destroy = drv_gem_bo_destroy, - .bo_map = drv_rockchip_bo_map, + .bo_map = rockchip_bo_map, .format_list = { {DRV_FORMAT_XRGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_RENDERING}, {DRV_FORMAT_XRGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR}, diff --git a/tegra.c b/tegra.c index 91348b1..17a4cbd 100644 --- a/tegra.c +++ b/tegra.c @@ -87,8 +87,8 @@ static void compute_layout_linear(int width, int height, int format, *size = *stride * height; } -static int drv_tegra_bo_create(struct bo *bo, uint32_t width, - uint32_t height, uint32_t format, uint32_t flags) +static int tegra_bo_create(struct bo *bo, uint32_t width, uint32_t height, + uint32_t format, uint32_t flags) { uint32_t size, stride, block_height_log2 = 0; enum nv_mem_kind kind = NV_MEM_KIND_PITCH; @@ -141,7 +141,7 @@ static int drv_tegra_bo_create(struct bo *bo, uint32_t width, return 0; } -static void *drv_tegra_bo_map(struct bo *bo) +static void *tegra_bo_map(struct bo *bo) { int ret; struct drm_tegra_gem_mmap gem_map; @@ -163,9 +163,9 @@ static void *drv_tegra_bo_map(struct bo *bo) const struct backend backend_tegra = { .name = "tegra", - .bo_create = drv_tegra_bo_create, + .bo_create = tegra_bo_create, .bo_destroy = drv_gem_bo_destroy, - .bo_map = drv_tegra_bo_map, + .bo_map = tegra_bo_map, .format_list = { /* Linear support */ {DRV_FORMAT_XRGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},