From 641099fe0cf878fdab8e42d907ed383e9d5a9c16 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Fri, 22 Nov 2019 11:05:40 +0100 Subject: drm/gma500: Remove addr_space field from psb_framebuffer The field 'addr_space' in struct psb_framebuffer serves no purpose. Remove it. Signed-off-by: Thomas Zimmermann Signed-off-by: Patrik Jakobsson Link: https://patchwork.freedesktop.org/patch/msgid/20191122100545.16812-2-tzimmermann@suse.de --- drivers/gpu/drm/gma500/framebuffer.h | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/gpu/drm/gma500/framebuffer.h') diff --git a/drivers/gpu/drm/gma500/framebuffer.h b/drivers/gpu/drm/gma500/framebuffer.h index ae8a02639fd9..a2d68dd74c12 100644 --- a/drivers/gpu/drm/gma500/framebuffer.h +++ b/drivers/gpu/drm/gma500/framebuffer.h @@ -15,7 +15,6 @@ struct psb_framebuffer { struct drm_framebuffer base; - struct address_space *addr_space; struct fb_info *fbdev; }; -- cgit From 86eda5a4c16757d04db9770b7c1399ecf8f268ca Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Fri, 22 Nov 2019 11:05:41 +0100 Subject: drm/gma500: Remove field 'fbdev' from struct psb_framebuffer The field 'fbdev' in struct psb_framebuffer serves no purpose. Remove it. Signed-off-by: Thomas Zimmermann Signed-off-by: Patrik Jakobsson Link: https://patchwork.freedesktop.org/patch/msgid/20191122100545.16812-3-tzimmermann@suse.de --- drivers/gpu/drm/gma500/framebuffer.h | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/gpu/drm/gma500/framebuffer.h') diff --git a/drivers/gpu/drm/gma500/framebuffer.h b/drivers/gpu/drm/gma500/framebuffer.h index a2d68dd74c12..95d4485dc860 100644 --- a/drivers/gpu/drm/gma500/framebuffer.h +++ b/drivers/gpu/drm/gma500/framebuffer.h @@ -15,7 +15,6 @@ struct psb_framebuffer { struct drm_framebuffer base; - struct fb_info *fbdev; }; struct psb_fbdev { -- cgit From e18da8ce7d730b393581b1ee75e50faaa30f054c Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Fri, 22 Nov 2019 11:05:42 +0100 Subject: drm/gma500: Replace struct psb_framebuffer with struct drm_framebuffer After removing all unnecessary fields, struct psb_framebuffer is just a wrapper around struct drm_framebuffer. So we can replace the former with the latter. Signed-off-by: Thomas Zimmermann Signed-off-by: Patrik Jakobsson Link: https://patchwork.freedesktop.org/patch/msgid/20191122100545.16812-4-tzimmermann@suse.de --- drivers/gpu/drm/gma500/framebuffer.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'drivers/gpu/drm/gma500/framebuffer.h') diff --git a/drivers/gpu/drm/gma500/framebuffer.h b/drivers/gpu/drm/gma500/framebuffer.h index 95d4485dc860..ae12801829b2 100644 --- a/drivers/gpu/drm/gma500/framebuffer.h +++ b/drivers/gpu/drm/gma500/framebuffer.h @@ -13,17 +13,11 @@ #include "psb_drv.h" -struct psb_framebuffer { - struct drm_framebuffer base; -}; - struct psb_fbdev { struct drm_fb_helper psb_fb_helper; /* must be first */ - struct psb_framebuffer pfb; + struct drm_framebuffer fb; }; -#define to_psb_fb(x) container_of(x, struct psb_framebuffer, base) - extern int gma_connector_clones(struct drm_device *dev, int type_mask); #endif -- cgit From 0a8ec2ed0783eb5f0b9a86adc92c8606808c8fd8 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Fri, 22 Nov 2019 11:05:44 +0100 Subject: drm/gma500: Store framebuffer in struct drm_fb_helper The gma500 driver stores the console framebuffer in struct psb_fbdev. Moving it into struct drm_fb_helper will allow for removal of struct psb_fbdev. Signed-off-by: Thomas Zimmermann Signed-off-by: Patrik Jakobsson Link: https://patchwork.freedesktop.org/patch/msgid/20191122100545.16812-6-tzimmermann@suse.de --- drivers/gpu/drm/gma500/framebuffer.h | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/gpu/drm/gma500/framebuffer.h') diff --git a/drivers/gpu/drm/gma500/framebuffer.h b/drivers/gpu/drm/gma500/framebuffer.h index ae12801829b2..c75f48c44921 100644 --- a/drivers/gpu/drm/gma500/framebuffer.h +++ b/drivers/gpu/drm/gma500/framebuffer.h @@ -15,7 +15,6 @@ struct psb_fbdev { struct drm_fb_helper psb_fb_helper; /* must be first */ - struct drm_framebuffer fb; }; extern int gma_connector_clones(struct drm_device *dev, int type_mask); -- cgit From 6b7ce2c4161a00e0ab6170ca299ea330a914de9c Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Fri, 22 Nov 2019 11:05:45 +0100 Subject: drm/gma500: Remove struct psb_fbdev Gma500's struct psb_fbdev is an, otherwise empty, wrapper around struct drm_fb_helper. Remove it. Signed-off-by: Thomas Zimmermann Signed-off-by: Patrik Jakobsson Link: https://patchwork.freedesktop.org/patch/msgid/20191122100545.16812-7-tzimmermann@suse.de --- drivers/gpu/drm/gma500/framebuffer.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'drivers/gpu/drm/gma500/framebuffer.h') diff --git a/drivers/gpu/drm/gma500/framebuffer.h b/drivers/gpu/drm/gma500/framebuffer.h index c75f48c44921..2fbba4b48841 100644 --- a/drivers/gpu/drm/gma500/framebuffer.h +++ b/drivers/gpu/drm/gma500/framebuffer.h @@ -9,14 +9,8 @@ #ifndef _FRAMEBUFFER_H_ #define _FRAMEBUFFER_H_ -#include - #include "psb_drv.h" -struct psb_fbdev { - struct drm_fb_helper psb_fb_helper; /* must be first */ -}; - extern int gma_connector_clones(struct drm_device *dev, int type_mask); #endif -- cgit