diff options
author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-03-31 22:32:11 +0100 |
---|---|---|
committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-04-28 11:19:15 +0100 |
commit | 0f8da82500ec542e269092c0718479e25eaff5f6 (patch) | |
tree | 4bfdf0fe56674bd42926f6f4607331d1468d08dd /exynos | |
parent | 104c895f650cac7741c12e10ee78bb2fca2cbd49 (diff) |
drm: remove drm_public macro
Some compilers (like the Oracle Studio), require that the function
declaration must be annotated with the same visibility attribute as the
definition. As annotating functions with drm_public is no longer
required just remove the macro.
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Damien Lespiau <damien.lespiau@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Cc: Michel Dänzer <michel.daenzer@amd.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Thierry Reding <treding@nvidia.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'exynos')
-rw-r--r-- | exynos/exynos_drm.c | 24 | ||||
-rw-r--r-- | exynos/exynos_fimg2d.c | 16 |
2 files changed, 20 insertions, 20 deletions
diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c index 5d07ea7b1471..df9b8ed4d390 100644 --- a/exynos/exynos_drm.c +++ b/exynos/exynos_drm.c @@ -49,7 +49,7 @@ * * if true, return the device object else NULL. */ -drm_public struct exynos_device * exynos_device_create(int fd) +struct exynos_device * exynos_device_create(int fd) { struct exynos_device *dev; @@ -70,7 +70,7 @@ drm_public struct exynos_device * exynos_device_create(int fd) * * @dev: exynos drm device object. */ -drm_public void exynos_device_destroy(struct exynos_device *dev) +void exynos_device_destroy(struct exynos_device *dev) { free(dev); } @@ -88,7 +88,7 @@ drm_public void exynos_device_destroy(struct exynos_device *dev) * * if true, return a exynos buffer object else NULL. */ -drm_public struct exynos_bo * exynos_bo_create(struct exynos_device *dev, +struct exynos_bo * exynos_bo_create(struct exynos_device *dev, size_t size, uint32_t flags) { struct exynos_bo *bo; @@ -142,7 +142,7 @@ fail: * * if true, return 0 else negative. */ -drm_public int exynos_bo_get_info(struct exynos_device *dev, uint32_t handle, +int exynos_bo_get_info(struct exynos_device *dev, uint32_t handle, size_t *size, uint32_t *flags) { int ret; @@ -168,7 +168,7 @@ drm_public int exynos_bo_get_info(struct exynos_device *dev, uint32_t handle, * * @bo: a exynos buffer object to be destroyed. */ -drm_public void exynos_bo_destroy(struct exynos_bo *bo) +void exynos_bo_destroy(struct exynos_bo *bo) { if (!bo) return; @@ -200,7 +200,7 @@ drm_public void exynos_bo_destroy(struct exynos_bo *bo) * if true, return a exynos buffer object else NULL. * */ -drm_public struct exynos_bo * +struct exynos_bo * exynos_bo_from_name(struct exynos_device *dev, uint32_t name) { struct exynos_bo *bo; @@ -243,7 +243,7 @@ err_free_bo: * * if true, return 0 else negative. */ -drm_public int exynos_bo_get_name(struct exynos_bo *bo, uint32_t *name) +int exynos_bo_get_name(struct exynos_bo *bo, uint32_t *name) { if (!bo->name) { struct drm_gem_flink req = { @@ -266,7 +266,7 @@ drm_public int exynos_bo_get_name(struct exynos_bo *bo, uint32_t *name) return 0; } -drm_public uint32_t exynos_bo_handle(struct exynos_bo *bo) +uint32_t exynos_bo_handle(struct exynos_bo *bo) { return bo->handle; } @@ -279,7 +279,7 @@ drm_public uint32_t exynos_bo_handle(struct exynos_bo *bo) * * if true, user pointer mmaped else NULL. */ -drm_public void *exynos_bo_map(struct exynos_bo *bo) +void *exynos_bo_map(struct exynos_bo *bo) { if (!bo->vaddr) { struct exynos_device *dev = bo->dev; @@ -316,7 +316,7 @@ drm_public void *exynos_bo_map(struct exynos_bo *bo) * * @return: 0 on success, -1 on error, and errno will be set */ -drm_public int +int exynos_prime_handle_to_fd(struct exynos_device *dev, uint32_t handle, int *fd) { return drmPrimeHandleToFD(dev->fd, handle, 0, fd); @@ -331,7 +331,7 @@ exynos_prime_handle_to_fd(struct exynos_device *dev, uint32_t handle, int *fd) * * @return: 0 on success, -1 on error, and errno will be set */ -drm_public int +int exynos_prime_fd_to_handle(struct exynos_device *dev, int fd, uint32_t *handle) { return drmPrimeFDToHandle(dev->fd, fd, handle); @@ -354,7 +354,7 @@ exynos_prime_fd_to_handle(struct exynos_device *dev, int fd, uint32_t *handle) * * if true, return 0 else negative. */ -drm_public int +int exynos_vidi_connection(struct exynos_device *dev, uint32_t connect, uint32_t ext, void *edid) { diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c index cb422e8a454e..86ae8989a776 100644 --- a/exynos/exynos_fimg2d.c +++ b/exynos/exynos_fimg2d.c @@ -224,7 +224,7 @@ static int g2d_flush(struct g2d_context *ctx) * * fd: a file descriptor to an opened drm device. */ -drm_public struct g2d_context *g2d_init(int fd) +struct g2d_context *g2d_init(int fd) { struct drm_exynos_g2d_get_ver ver; struct g2d_context *ctx; @@ -252,7 +252,7 @@ drm_public struct g2d_context *g2d_init(int fd) return ctx; } -drm_public void g2d_fini(struct g2d_context *ctx) +void g2d_fini(struct g2d_context *ctx) { if (ctx) free(ctx); @@ -263,7 +263,7 @@ drm_public void g2d_fini(struct g2d_context *ctx) * * @ctx: a pointer to g2d_context structure. */ -drm_public int g2d_exec(struct g2d_context *ctx) +int g2d_exec(struct g2d_context *ctx) { struct drm_exynos_g2d_exec exec; int ret; @@ -295,7 +295,7 @@ drm_public int g2d_exec(struct g2d_context *ctx) * @w: width value to buffer filled with given color data. * @h: height value to buffer filled with given color data. */ -drm_public int +int g2d_solid_fill(struct g2d_context *ctx, struct g2d_image *img, unsigned int x, unsigned int y, unsigned int w, unsigned int h) @@ -350,7 +350,7 @@ g2d_solid_fill(struct g2d_context *ctx, struct g2d_image *img, * @w: width value to source and destination buffers. * @h: height value to source and destination buffers. */ -drm_public int +int g2d_copy(struct g2d_context *ctx, struct g2d_image *src, struct g2d_image *dst, unsigned int src_x, unsigned int src_y, unsigned int dst_x, unsigned dst_y, unsigned int w, @@ -440,7 +440,7 @@ g2d_copy(struct g2d_context *ctx, struct g2d_image *src, * @negative: indicate that it uses color negative to source and * destination buffers. */ -drm_public int +int g2d_copy_with_scale(struct g2d_context *ctx, struct g2d_image *src, struct g2d_image *dst, unsigned int src_x, unsigned int src_y, unsigned int src_w, @@ -548,7 +548,7 @@ g2d_copy_with_scale(struct g2d_context *ctx, struct g2d_image *src, * @h: height value to source and destination buffer. * @op: blend operation type. */ -drm_public int +int g2d_blend(struct g2d_context *ctx, struct g2d_image *src, struct g2d_image *dst, unsigned int src_x, unsigned int src_y, unsigned int dst_x, unsigned int dst_y, @@ -659,7 +659,7 @@ g2d_blend(struct g2d_context *ctx, struct g2d_image *src, * @dst_h: height value to destination buffer. * @op: blend operation type. */ -drm_public int +int g2d_scale_and_blend(struct g2d_context *ctx, struct g2d_image *src, struct g2d_image *dst, unsigned int src_x, unsigned int src_y, unsigned int src_w, unsigned int src_h, unsigned int dst_x, |