From: yxj <yxj@rock-chips.com>
Date: Wed, 19 Mar 2014 08:16:45 +0000 (+0800)
Subject: rk fb: made some cleanup
X-Git-Tag: firefly_0821_release~6001^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f17a071d0b3a08b88773be1df85b07439fee45a0;p=firefly-linux-kernel-4.4.55.git

rk fb: made some cleanup
---

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index fe86fbac2a75..ab651d3bcb15 100755
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -2514,8 +2514,6 @@ static int rk_fb_alloc_buffer(struct fb_info *fbi, int fb_id)
 #ifdef	USE_ION_MMU
 	struct dma_buf *buf;
 #else
-	dma_addr_t fb_mem_phys;
-	void *fb_mem_virt;
 	size_t len;
 #endif	
 #endif
@@ -2536,12 +2534,12 @@ static int rk_fb_alloc_buffer(struct fb_info *fbi, int fb_id)
 		}
 		win->area[0].ion_hdl = handle;
 		fbi->screen_base = ion_map_kernel(rk_fb->ion_client, handle);
-		#ifndef USE_ION_MMU
+#ifndef USE_ION_MMU
 			ion_phys(rk_fb->ion_client, handle, &phy_addr, &len);
 			fbi->fix.smem_start = phy_addr;
 			fbi->fix.smem_len = len;
-			printk(KERN_INFO "alloc_buffer:ion_phy_addr=0x%x\n",phy_addr);
-		#else
+			printk(KERN_INFO "alloc_buffer:ion_phy_addr=0x%lx\n",phy_addr);
+#else
 			buf = ion_share_dma_buf(rk_fb->ion_client, handle);
 			if (IS_ERR_OR_NULL(buf)) {
 				dev_err(fbi->device, "ion_share_dma_buf() failed\n");
@@ -2552,12 +2550,13 @@ static int rk_fb_alloc_buffer(struct fb_info *fbi, int fb_id)
 			fbi->fix.smem_len = buf->size;
 			printk(KERN_INFO "alloc_buffer:kernel_vir_addr=0x%x,mmu_vir_addr=0x%x,len=0x%x\n",
 							fbi->screen_base,fbi->fix.smem_start,fbi->fix.smem_len);
-		#endif
+#endif
 		
 #else
-
-		fb_mem_virt = dma_alloc_writecombine(fbi->dev, fb_mem_size, &fb_mem_phys,
-			GFP_KERNEL);
+		dma_addr_t fb_mem_phys;
+		void *fb_mem_virt;
+		fb_mem_virt = dma_alloc_writecombine(fbi->dev, fb_mem_size,
+					&fb_mem_phys,GFP_KERNEL);
 		if (!fb_mem_virt) {
 			pr_err("%s: Failed to allocate framebuffer\n", __func__);
 			return -ENOMEM;
@@ -2885,48 +2884,6 @@ int rk_fb_unregister(struct rk_lcdc_driver *dev_drv)
 }
 
 
-
-#if defined(CONFIG_HAS_EARLYSUSPEND)
-struct suspend_info {
-	struct early_suspend early_suspend;
-	struct rk_fb *inf;
-};
-
-static void rkfb_early_suspend(struct early_suspend *h)
-{
-	struct suspend_info *info = container_of(h, struct suspend_info,
-						early_suspend);
-	struct rk_fb *inf = info->inf;
-	int i;
-	for (i = 0; i < inf->num_lcdc; i++) {
-		if (!inf->lcdc_dev_drv[i])
-			continue;
-		inf->lcdc_dev_drv[i]->suspend(inf->lcdc_dev_drv[i]);
-	}
-}
-static void rkfb_early_resume(struct early_suspend *h)
-{
-	struct suspend_info *info = container_of(h, struct suspend_info,
-						early_suspend);
-	struct rk_fb *inf = info->inf;
-	int i;
-	for (i = 0; i < inf->num_lcdc; i++) {
-		if (!inf->lcdc_dev_drv[i])
-			continue;
-		inf->lcdc_dev_drv[i]->resume(inf->lcdc_dev_drv[i]);
-	}
-
-}
-
-
-
-static struct suspend_info suspend_info = {
-	.early_suspend.suspend = rkfb_early_suspend,
-	.early_suspend.resume = rkfb_early_resume,
-	.early_suspend.level = EARLY_SUSPEND_LEVEL_DISABLE_FB,
-};
-#endif
-
 static int rk_fb_probe(struct platform_device *pdev)
 {
 	struct rk_fb *rk_fb = NULL;
@@ -2963,10 +2920,6 @@ static int rk_fb_probe(struct platform_device *pdev)
 	}
 #endif
 
-#if defined(CONFIG_HAS_EARLYSUSPEND)
-	suspend_info.inf = rk_fb;
-	register_early_suspend(&suspend_info.early_suspend);
-#endif
 	fb_pdev = pdev;
 	dev_info(&pdev->dev, "rockchip framebuffer driver probe\n");
 	return 0;
@@ -2990,9 +2943,6 @@ static void rk_fb_shutdown(struct platform_device *pdev)
 
 	}
 
-#if	defined(CONFIG_HAS_EARLYSUSPEND)
-	unregister_early_suspend(&suspend_info.early_suspend);
-#endif
 }
 
 
diff --git a/drivers/video/rockchip/screen/rk_screen.c b/drivers/video/rockchip/screen/rk_screen.c
index 085463475317..50590c491bd8 100644
--- a/drivers/video/rockchip/screen/rk_screen.c
+++ b/drivers/video/rockchip/screen/rk_screen.c
@@ -18,11 +18,6 @@ int rk_fb_set_prmry_screen(struct rk_screen *screen)
 	return 0;
 }
 
-size_t get_fb_size(void)
-{
-	
-}
-
 static int rk_screen_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;