summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/omapdrm/omap_plane.c
diff options
context:
space:
mode:
authorJyri Sarha <jsarha@ti.com>2017-03-24 17:47:54 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2017-04-03 12:36:40 +0300
commit694c99cf6f5a13774bbdbf5becdbf59451b955f0 (patch)
tree34dd3e40d5a87ea0119e94ea1c4ae86c017af24a /drivers/gpu/drm/omapdrm/omap_plane.c
parent273ffeaf8c90c4afc88bc48189d9e8c20106fac7 (diff)
downloadlinux-694c99cf6f5a13774bbdbf5becdbf59451b955f0.tar.xz
drm/omap: Remove the obsolete #define omap_plane _omap_plane hack
Remove the obsolete "#define omap_plane _omap_plane" hack and other related hacks to get around the enum omap_plane colliding with struct omap_plane. Signed-off-by: Jyri Sarha <jsarha@ti.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_plane.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_plane.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index 78a92422ede1..7abb49b7d606 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -24,12 +24,6 @@
#include "omap_dmm_tiler.h"
#include "omap_drv.h"
-/* some hackery because omapdss has an 'enum omap_plane' (which would be
- * better named omap_plane_id).. and compiler seems unhappy about having
- * both a 'struct omap_plane' and 'enum omap_plane'
- */
-#define omap_plane _omap_plane
-
/*
* plane funcs
*/
@@ -38,7 +32,7 @@
struct omap_plane {
struct drm_plane base;
- int id; /* TODO rename omap_plane -> omap_plane_id in omapdss so I can use the enum */
+ enum omap_plane_id id;
const char *name;
uint32_t nformats;