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>
This commit is contained in:
parent
273ffeaf8c
commit
694c99cf6f
|
@ -24,12 +24,6 @@
|
||||||
#include "omap_dmm_tiler.h"
|
#include "omap_dmm_tiler.h"
|
||||||
#include "omap_drv.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
|
* plane funcs
|
||||||
*/
|
*/
|
||||||
|
@ -38,7 +32,7 @@
|
||||||
|
|
||||||
struct omap_plane {
|
struct omap_plane {
|
||||||
struct drm_plane base;
|
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;
|
const char *name;
|
||||||
|
|
||||||
uint32_t nformats;
|
uint32_t nformats;
|
||||||
|
|
Loading…
Reference in New Issue