From 44476f826f166461d10142935ef20b23c8c010c4 Mon Sep 17 00:00:00 2001 From: "Venkata(Muni) Anda" Date: Wed, 17 Mar 2010 22:06:50 -0700 Subject: tegra fb: Cleanup partially removed fb disable code. An ioctl to disable fb used to exist and called from the nvrm daemon code. This was partially removed sometime back and there are still traces of that code causing some confusion which is cleaned up by this commit. ioctl define is left as-is so maintain compatibility to user mode code. Change-Id: I3f792d6be075a8754ea448d588e484afc67bd8ba Reviewed-on: http://git-master/r/878 Reviewed-by: Venkata (Muni) Anda Tested-by: Venkata (Muni) Anda Reviewed-by: Gary King --- arch/arm/mach-tegra/nvrm_user.c | 10 ++-------- drivers/video/tegra-fb.c | 13 ------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/arch/arm/mach-tegra/nvrm_user.c b/arch/arm/mach-tegra/nvrm_user.c index ffb0751a1035..a05cbd376809 100644 --- a/arch/arm/mach-tegra/nvrm_user.c +++ b/arch/arm/mach-tegra/nvrm_user.c @@ -68,12 +68,6 @@ static NvRtHandle s_RtHandle = NULL; #define DEVICE_NAME "nvrm" -#ifdef CONFIG_FB_TEGRA -extern int tegra_fb_control(void *in, void *out); -#else -#define tegra_fb_control(_i, _o) do {} while (0) -#endif - static const struct file_operations nvrm_fops = { .owner = THIS_MODULE, @@ -283,8 +277,8 @@ long nvrm_unlocked_ioctl(struct file *file, printk( "NvRmIoctls_NvRmGraphics: not supported\n" ); goto fail; case NvRmIoctls_NvRmFbControl: - tegra_fb_control(0, 0); - break; + printk( "NvRmIoctls_NvRmFbControl: deprecated \n" ); + break; case NvRmIoctls_NvRmMemRead: case NvRmIoctls_NvRmMemWrite: diff --git a/drivers/video/tegra-fb.c b/drivers/video/tegra-fb.c index 9092c5f90412..24a90213ecdc 100644 --- a/drivers/video/tegra-fb.c +++ b/drivers/video/tegra-fb.c @@ -74,7 +74,6 @@ static struct fb_info tegra_fb_info = { }, }; -static unsigned long s_fb_disable = 0; unsigned long s_fb_addr; unsigned long s_fb_size; unsigned long s_fb_width; @@ -82,12 +81,6 @@ unsigned long s_fb_height; int s_fb_Bpp; NvRmMemHandle s_fb_hMem; -int tegra_fb_control(void *in, void *out); - -#define DISPLAY_BASE (0x54200000) -#define REGW( reg, val ) \ - *((u32 *)s_fb_regs + (reg)) = (val) - /* palette attary used by the fbcon */ u32 pseudo_palette[16]; @@ -196,12 +189,6 @@ int tegra_fb_sync(struct fb_info *info) return 0; } -int tegra_fb_control(void *in, void *out) -{ - s_fb_disable = 1; - return 0; -} - static int tegra_plat_probe( struct platform_device *d ) { NvError e; -- cgit v1.2.3