Merge remote-tracking branch 'battery/for-next'

[deliverable/linux.git] / drivers / gpu / drm / mediatek / mtk_drm_plane.h

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.h b/drivers/gpu/drm/mediatek/mtk_drm_plane.h
index 72a7b3e4c126f8833c29e17775746811c9251533..6a20b49e0f2fec768f4e40381809488655d4bd06 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.h
@@ -18,11 +18,6 @@
 #include <drm/drm_crtc.h>
 #include <linux/types.h>
 
-struct mtk_drm_plane {
-       struct drm_plane                base;
-       unsigned int                    idx;
-};
-
 struct mtk_plane_pending_state {
        bool                            config;
        bool                            enable;
@@ -41,19 +36,13 @@ struct mtk_plane_state {
        struct mtk_plane_pending_state  pending;
 };
 
-static inline struct mtk_drm_plane *to_mtk_plane(struct drm_plane *plane)
-{
-       return container_of(plane, struct mtk_drm_plane, base);
-}
-
 static inline struct mtk_plane_state *
 to_mtk_plane_state(struct drm_plane_state *state)
 {
        return container_of(state, struct mtk_plane_state, base);
 }
 
-int mtk_plane_init(struct drm_device *dev, struct mtk_drm_plane *mtk_plane,
-                  unsigned long possible_crtcs, enum drm_plane_type type,
-                  unsigned int zpos);
+int mtk_plane_init(struct drm_device *dev, struct drm_plane *plane,
+                  unsigned long possible_crtcs, enum drm_plane_type type);
 
 #endif