Skip to content

Commit ff059fc

Browse files
fooishbardaeinki
authored andcommitted
drm/exynos: exynos_drm_fb -> drm_framebuffer
Now exynos_drm_fb is just an empty wrapper around drm_framebuffer, we can drop it. Signed-off-by: Daniel Stone <[email protected]> Signed-off-by: Inki Dae <[email protected]> Cc: Inki Dae <[email protected]> Cc: Joonyoung Shim <[email protected]> Cc: Seung-Woo Kim <[email protected]> Cc: Kyungmin Park <[email protected]>
1 parent 7b30508 commit ff059fc

File tree

1 file changed

+8
-20
lines changed

1 file changed

+8
-20
lines changed

drivers/gpu/drm/exynos/exynos_drm_fb.c

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,6 @@
2727
#include "exynos_drm_iommu.h"
2828
#include "exynos_drm_crtc.h"
2929

30-
#define to_exynos_fb(x) container_of(x, struct exynos_drm_fb, fb)
31-
32-
/*
33-
* exynos specific framebuffer structure.
34-
*
35-
* @fb: drm framebuffer obejct.
36-
* @exynos_gem: array of exynos specific gem object containing a gem object.
37-
*/
38-
struct exynos_drm_fb {
39-
struct drm_framebuffer fb;
40-
};
41-
4230
static int check_fb_gem_memory_type(struct drm_device *drm_dev,
4331
struct exynos_drm_gem *exynos_gem)
4432
{
@@ -76,34 +64,34 @@ exynos_drm_framebuffer_init(struct drm_device *dev,
7664
struct exynos_drm_gem **exynos_gem,
7765
int count)
7866
{
79-
struct exynos_drm_fb *exynos_fb;
67+
struct drm_framebuffer *fb;
8068
int i;
8169
int ret;
8270

83-
exynos_fb = kzalloc(sizeof(*exynos_fb), GFP_KERNEL);
84-
if (!exynos_fb)
71+
fb = kzalloc(sizeof(*fb), GFP_KERNEL);
72+
if (!fb)
8573
return ERR_PTR(-ENOMEM);
8674

8775
for (i = 0; i < count; i++) {
8876
ret = check_fb_gem_memory_type(dev, exynos_gem[i]);
8977
if (ret < 0)
9078
goto err;
9179

92-
exynos_fb->fb.obj[i] = &exynos_gem[i]->base;
80+
fb->obj[i] = &exynos_gem[i]->base;
9381
}
9482

95-
drm_helper_mode_fill_fb_struct(dev, &exynos_fb->fb, mode_cmd);
83+
drm_helper_mode_fill_fb_struct(dev, fb, mode_cmd);
9684

97-
ret = drm_framebuffer_init(dev, &exynos_fb->fb, &exynos_drm_fb_funcs);
85+
ret = drm_framebuffer_init(dev, fb, &exynos_drm_fb_funcs);
9886
if (ret < 0) {
9987
DRM_ERROR("failed to initialize framebuffer\n");
10088
goto err;
10189
}
10290

103-
return &exynos_fb->fb;
91+
return fb;
10492

10593
err:
106-
kfree(exynos_fb);
94+
kfree(fb);
10795
return ERR_PTR(ret);
10896
}
10997

0 commit comments

Comments
 (0)