Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 694c99cf authored by Jyri Sarha's avatar Jyri Sarha Committed by Tomi Valkeinen
Browse files

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: default avatarJyri Sarha <jsarha@ti.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 273ffeaf

drivers/gpu/drm/omapdrm/omap_plane.c

+1 −7
Original line number Diff line number Diff line
@@ -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;