From: Jyri Sarha Date: Fri, 24 Mar 2017 14:47:54 +0000 (+0200) Subject: drm/omap: Remove the obsolete #define omap_plane _omap_plane hack X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=694c99cf6f5a13774bbdbf5becdbf59451b955f0;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Reviewed-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- 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;