Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ef9861c authored by Bryan Wu's avatar Bryan Wu Committed by Linus Torvalds
Browse files

blackfin video driver: update the BF52x EZKIT video framebuffer driver according to LKML review 



- Allocate pseudo_palette together with fbinfo
- Code cleanup

Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a99acc83

drivers/video/bfin-t350mcqb-fb.c

+14 −22
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ struct bfin_t350mcqbfb_info { 
	int lq043_open_cnt;

	int irq;

	spinlock_t lock;	/* lock */

	u32 pseudo_pal[16];

};



static int nocursor;
@@ -182,13 +183,13 @@ static void bfin_t350mcqb_config_dma(struct bfin_t350mcqbfb_info *fbi) 


}



static int bfin_t350mcqb_request_ports(int action)

{

	u16 ppi0_req_8[] = {P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2,

static	u16 ppi0_req_8[] = {P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2,

			    P_PPI0_D0, P_PPI0_D1, P_PPI0_D2,

			    P_PPI0_D3, P_PPI0_D4, P_PPI0_D5,

			    P_PPI0_D6, P_PPI0_D7, 0};



static int bfin_t350mcqb_request_ports(int action)

{

	if (action) {

		if (peripheral_request_list(ppi0_req_8, DRIVER_NAME)) {

			printk(KERN_ERR "Requesting Peripherals faild\n");
@@ -520,16 +521,7 @@ static int __init bfin_t350mcqb_probe(struct platform_device *pdev) 


	fbinfo->fbops = &bfin_t350mcqb_fb_ops;



	fbinfo->pseudo_palette = kmalloc(sizeof(u32) * 16, GFP_KERNEL);

	if (!fbinfo->pseudo_palette) {

		printk(KERN_ERR DRIVER_NAME

		       "Fail to allocate pseudo_palette\n");



		ret = -ENOMEM;

		goto out4;

	}



	memset(fbinfo->pseudo_palette, 0, sizeof(u32) * 16);

	fbinfo->pseudo_palette = &info->pseudo_pal;



	if (fb_alloc_cmap(&fbinfo->cmap, BFIN_LCD_NBR_PALETTE_ENTRIES, 0)

	    < 0) {
@@ -537,7 +529,7 @@ static int __init bfin_t350mcqb_probe(struct platform_device *pdev) 
		       "Fail to allocate colormap (%d entries)\n",

		       BFIN_LCD_NBR_PALETTE_ENTRIES);

		ret = -EFAULT;

		goto out5;

		goto out4;

	}



	if (bfin_t350mcqb_request_ports(1)) {
@@ -552,11 +544,11 @@ static int __init bfin_t350mcqb_probe(struct platform_device *pdev) 
		goto out7;

	}



	if (request_irq(info->irq, (void *)bfin_t350mcqb_irq_error, IRQF_DISABLED,

			"PPI ERROR", info) < 0) {

	ret = request_irq(info->irq, bfin_t350mcqb_irq_error, IRQF_DISABLED,

			"PPI ERROR", info);

	if (ret < 0) {

		printk(KERN_ERR DRIVER_NAME

		       ": unable to request PPI ERROR IRQ\n");

		ret = -EFAULT;

		goto out7;

	}
@@ -584,8 +576,6 @@ out7: 
	bfin_t350mcqb_request_ports(0);

out6:

	fb_dealloc_cmap(&fbinfo->cmap);

out5:

	kfree(fbinfo->pseudo_palette);

out4:

	dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,

			  info->dma_handle);
@@ -605,6 +595,8 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev) 
	struct fb_info *fbinfo = platform_get_drvdata(pdev);

	struct bfin_t350mcqbfb_info *info = fbinfo->par;



	unregister_framebuffer(fbinfo);



	free_dma(CH_PPI);

	free_irq(info->irq, info);
@@ -612,7 +604,6 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev) 
		dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,

				  info->dma_handle);



	kfree(fbinfo->pseudo_palette);

	fb_dealloc_cmap(&fbinfo->cmap);



#ifndef NO_BL_SUPPORT
@@ -620,10 +611,11 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev) 
	backlight_device_unregister(bl_dev);

#endif



	unregister_framebuffer(fbinfo);



	bfin_t350mcqb_request_ports(0);



	platform_set_drvdata(pdev, NULL);

	framebuffer_release(fbinfo);



	printk(KERN_INFO DRIVER_NAME ": Unregister LCD driver.\n");



	return 0;