| Message ID | 448e5542be98cc876d9a528c587449820f6a3770.1490366823.git.jsarha@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Jyri, Thank you for the patch. On Friday 24 Mar 2017 16:47:54 Jyri Sarha wrote: > 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> > --- > drivers/gpu/drm/omapdrm/omap_plane.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c > b/drivers/gpu/drm/omapdrm/omap_plane.c index 27c1902..64d53c4 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;
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c index 27c1902..64d53c4 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;
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> --- drivers/gpu/drm/omapdrm/omap_plane.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)