From b4dabcd737d9b7742d78f950a820a631c2ccae88 Mon Sep 17 00:00:00 2001 From: Luan Yuan Date: Fri, 11 Jan 2019 20:15:13 +0800 Subject: [PATCH] Revert "canvas: get canvas w/h for frame check [2/2]" This reverts commit 8667f1fbc184ccfc001a7006717cb0b5a7bdbdf9. --- drivers/amlogic/media/common/canvas/canvas.c | 21 -------------------- include/linux/amlogic/media/canvas/canvas.h | 4 ---- 2 files changed, 25 deletions(-) diff --git a/drivers/amlogic/media/common/canvas/canvas.c b/drivers/amlogic/media/common/canvas/canvas.c index 45caef23dde0..8e4b1f19a1fd 100644 --- a/drivers/amlogic/media/common/canvas/canvas.c +++ b/drivers/amlogic/media/common/canvas/canvas.c @@ -334,27 +334,6 @@ unsigned int canvas_get_addr(u32 index) } EXPORT_SYMBOL(canvas_get_addr); -unsigned int canvas_get_width(u32 index) -{ - struct canvas_device_info *info = &canvas_info; - - if (!CANVAS_VALID(index)) - return 0; - - return info->canvasPool[index].width; -} -EXPORT_SYMBOL(canvas_get_width); - -unsigned int canvas_get_height(u32 index) -{ - struct canvas_device_info *info = &canvas_info; - - if (!CANVAS_VALID(index)) - return 0; - - return info->canvasPool[index].height; -} -EXPORT_SYMBOL(canvas_get_height); /*********************************************************/ #define to_canvas(kobj) container_of(kobj, struct canvas_s, kobj) static ssize_t addr_show(struct canvas_s *canvas, char *buf) diff --git a/include/linux/amlogic/media/canvas/canvas.h b/include/linux/amlogic/media/canvas/canvas.h index 98de6f315a8f..b5ad4714a57b 100644 --- a/include/linux/amlogic/media/canvas/canvas.h +++ b/include/linux/amlogic/media/canvas/canvas.h @@ -86,8 +86,4 @@ extern void canvas_update_addr(u32 index, u32 addr); extern unsigned int canvas_get_addr(u32 index); -extern unsigned int canvas_get_width(u32 index); - -extern unsigned int canvas_get_height(u32 index); - #endif /* CANVAS_H */