summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2016-04-24 02:11:59 +0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-06-21 02:09:10 +0300
commitc3f34a4bdd596127000666c17bbf8ba1c3d2d332 (patch)
tree08bd24e112a7ceb46a93b406aa5fa811c0e6be52 /include/media
parent85e0a168f51b5ef9836288fa0f14dcadb8401181 (diff)
downloadlinux-c3f34a4bdd596127000666c17bbf8ba1c3d2d332.tar.xz
[media] v4l: vsp1: Remove deprecated DRM API
The DRM driver has switched to the new API, remove the deprecated macros and inline wrapper. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/vsp1.h28
1 files changed, 2 insertions, 26 deletions
diff --git a/include/media/vsp1.h b/include/media/vsp1.h
index ea8ad7537057..9322d9775fb7 100644
--- a/include/media/vsp1.h
+++ b/include/media/vsp1.h
@@ -34,32 +34,8 @@ struct vsp1_du_atomic_config {
};
void vsp1_du_atomic_begin(struct device *dev);
-int __vsp1_du_atomic_update(struct device *dev, unsigned int rpf,
- const struct vsp1_du_atomic_config *cfg);
+int vsp1_du_atomic_update(struct device *dev, unsigned int rpf,
+ const struct vsp1_du_atomic_config *cfg);
void vsp1_du_atomic_flush(struct device *dev);
-static inline int vsp1_du_atomic_update_old(struct device *dev,
- unsigned int rpf, u32 pixelformat, unsigned int pitch,
- dma_addr_t mem[2], const struct v4l2_rect *src,
- const struct v4l2_rect *dst)
-{
- struct vsp1_du_atomic_config cfg = {
- .pixelformat = pixelformat,
- .pitch = pitch,
- .mem[0] = mem[0],
- .mem[1] = mem[1],
- .src = *src,
- .dst = *dst,
- .alpha = 255,
- .zpos = 0,
- };
-
- return __vsp1_du_atomic_update(dev, rpf, &cfg);
-}
-
-#define _vsp1_du_atomic_update(_1, _2, _3, _4, _5, _6, _7, f, ...) f
-#define vsp1_du_atomic_update(...) \
- _vsp1_du_atomic_update(__VA_ARGS__, vsp1_du_atomic_update_old, 0, 0, \
- 0, __vsp1_du_atomic_update)(__VA_ARGS__)
-
#endif /* __MEDIA_VSP1_H__ */