summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2012-03-13 12:35:49 +0200
committerDave Airlie <airlied@redhat.com>2012-03-15 09:52:37 +0000
commitd63f5e6bf6f2a1573ea39c9937cdf5ab0b3a4b77 (patch)
treed396df2e0574c0e4b0d0672f612679ea2d7db091
parent6bfc56aa89f963becbafbaeb105b6a84e0eb0db7 (diff)
downloadlinux-3.10-d63f5e6bf6f2a1573ea39c9937cdf5ab0b3a4b77.tar.gz
linux-3.10-d63f5e6bf6f2a1573ea39c9937cdf5ab0b3a4b77.tar.bz2
linux-3.10-d63f5e6bf6f2a1573ea39c9937cdf5ab0b3a4b77.zip
drm: Use a flexible array member for blob property data
The blob property data is always allocated immediately after the object header. No need for the extra indirection when accessing it, just use a flexible array member. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_crtc.c1
-rw-r--r--include/drm/drm_crtc.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index f5b098e50bb..d2d9dc52ac8 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -2943,7 +2943,6 @@ static struct drm_property_blob *drm_property_create_blob(struct drm_device *dev
return NULL;
}
- blob->data = (void *)((char *)blob + sizeof(struct drm_property_blob));
blob->length = length;
memcpy(blob->data, data, length);
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 00f4007a6d0..53cb49a13e1 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -257,7 +257,7 @@ struct drm_property_blob {
struct drm_mode_object base;
struct list_head head;
unsigned int length;
- void *data;
+ unsigned char data[];
};
struct drm_property_enum {