diff mbox

[5/7] drm/i915: Use container_of() in the fbdev code

Message ID 1370020027-27595-6-git-send-email-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ville Syrjälä May 31, 2013, 5:07 p.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Use container_of() instead of a cast to get struct intel_fbdev
from struct drm_fb_helper.

Also populate the fb_info->par correctly with the drm_fb_helper pointer
instead of the intel_fbdev pointer.

There's no actual functional change since the drm_fb_helper happens to
be the first member inside intel_fbdev.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_fb.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Chris Wilson June 3, 2013, 10:08 a.m. UTC | #1 
On Fri, May 31, 2013 at 08:07:05PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Use container_of() instead of a cast to get struct intel_fbdev
> from struct drm_fb_helper.
> 
> Also populate the fb_info->par correctly with the drm_fb_helper pointer
> instead of the intel_fbdev pointer.
> 
> There's no actual functional change since the drm_fb_helper happens to
> be the first member inside intel_fbdev.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
Daniel Vetter June 3, 2013, 12:01 p.m. UTC | #2 
On Mon, Jun 03, 2013 at 11:08:30AM +0100, Chris Wilson wrote:
> On Fri, May 31, 2013 at 08:07:05PM +0300, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > Use container_of() instead of a cast to get struct intel_fbdev
> > from struct drm_fb_helper.
> > 
> > Also populate the fb_info->par correctly with the drm_fb_helper pointer
> > instead of the intel_fbdev pointer.
> > 
> > There's no actual functional change since the drm_fb_helper happens to
> > be the first member inside intel_fbdev.
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Queued for -next, thanks for the patch.
-Daniel
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index e8389df..60d0cf6 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -60,8 +60,9 @@  static struct fb_ops intelfb_ops = {
 static int intelfb_create(struct drm_fb_helper *helper,
 			  struct drm_fb_helper_surface_size *sizes)
 {
-	struct intel_fbdev *ifbdev = (struct intel_fbdev *)helper;
-	struct drm_device *dev = ifbdev->helper.dev;
+	struct intel_fbdev *ifbdev =
+		container_of(helper, struct intel_fbdev, helper);
+	struct drm_device *dev = helper->dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct fb_info *info;
 	struct drm_framebuffer *fb;
@@ -108,7 +109,7 @@  static int intelfb_create(struct drm_fb_helper *helper,
 		goto out_unpin;
 	}
 
-	info->par = ifbdev;
+	info->par = helper;
 
 	ret = intel_framebuffer_init(dev, &ifbdev->ifb, &mode_cmd, obj);
 	if (ret)