drm/omap: Remove the obsolete #define omap_plane _omap_plane hack
authorJyri Sarha <jsarha@ti.com>
Fri, 24 Mar 2017 14:47:54 +0000 (16:47 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 3 Apr 2017 09:36:40 +0000 (12:36 +0300)
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>
drivers/gpu/drm/omapdrm/omap_plane.c

index 78a92422ede14ea070c9c75e0383d01208b9588f..7abb49b7d6060fadf14acf9b5e8eacfb6e19281e 100644 (file)
 #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;