diff options
Diffstat (limited to 'drivers/video/bfin-t350mcqb-fb.c')
-rw-r--r-- | drivers/video/bfin-t350mcqb-fb.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c index 90cfddabf1f7..5cc36cfbf07b 100644 --- a/drivers/video/bfin-t350mcqb-fb.c +++ b/drivers/video/bfin-t350mcqb-fb.c | |||
@@ -242,7 +242,6 @@ static int bfin_t350mcqb_fb_release(struct fb_info *info, int user) | |||
242 | SSYNC(); | 242 | SSYNC(); |
243 | disable_dma(CH_PPI); | 243 | disable_dma(CH_PPI); |
244 | bfin_t350mcqb_stop_timers(); | 244 | bfin_t350mcqb_stop_timers(); |
245 | memset(fbi->fb_buffer, 0, info->fix.smem_len); | ||
246 | } | 245 | } |
247 | 246 | ||
248 | spin_unlock(&fbi->lock); | 247 | spin_unlock(&fbi->lock); |
@@ -527,8 +526,6 @@ static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev) | |||
527 | goto out3; | 526 | goto out3; |
528 | } | 527 | } |
529 | 528 | ||
530 | memset(info->fb_buffer, 0, fbinfo->fix.smem_len); | ||
531 | |||
532 | fbinfo->screen_base = (void *)info->fb_buffer + ACTIVE_VIDEO_MEM_OFFSET; | 529 | fbinfo->screen_base = (void *)info->fb_buffer + ACTIVE_VIDEO_MEM_OFFSET; |
533 | fbinfo->fix.smem_start = (int)info->fb_buffer + ACTIVE_VIDEO_MEM_OFFSET; | 530 | fbinfo->fix.smem_start = (int)info->fb_buffer + ACTIVE_VIDEO_MEM_OFFSET; |
534 | 531 | ||
@@ -602,7 +599,7 @@ out1: | |||
602 | return ret; | 599 | return ret; |
603 | } | 600 | } |
604 | 601 | ||
605 | static int bfin_t350mcqb_remove(struct platform_device *pdev) | 602 | static int __devexit bfin_t350mcqb_remove(struct platform_device *pdev) |
606 | { | 603 | { |
607 | 604 | ||
608 | struct fb_info *fbinfo = platform_get_drvdata(pdev); | 605 | struct fb_info *fbinfo = platform_get_drvdata(pdev); |
@@ -637,9 +634,6 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev) | |||
637 | #ifdef CONFIG_PM | 634 | #ifdef CONFIG_PM |
638 | static int bfin_t350mcqb_suspend(struct platform_device *pdev, pm_message_t state) | 635 | static int bfin_t350mcqb_suspend(struct platform_device *pdev, pm_message_t state) |
639 | { | 636 | { |
640 | struct fb_info *fbinfo = platform_get_drvdata(pdev); | ||
641 | struct bfin_t350mcqbfb_info *info = fbinfo->par; | ||
642 | |||
643 | bfin_t350mcqb_disable_ppi(); | 637 | bfin_t350mcqb_disable_ppi(); |
644 | disable_dma(CH_PPI); | 638 | disable_dma(CH_PPI); |
645 | bfin_write_PPI_STATUS(0xFFFF); | 639 | bfin_write_PPI_STATUS(0xFFFF); |
@@ -649,9 +643,6 @@ static int bfin_t350mcqb_suspend(struct platform_device *pdev, pm_message_t stat | |||
649 | 643 | ||
650 | static int bfin_t350mcqb_resume(struct platform_device *pdev) | 644 | static int bfin_t350mcqb_resume(struct platform_device *pdev) |
651 | { | 645 | { |
652 | struct fb_info *fbinfo = platform_get_drvdata(pdev); | ||
653 | struct bfin_t350mcqbfb_info *info = fbinfo->par; | ||
654 | |||
655 | enable_dma(CH_PPI); | 646 | enable_dma(CH_PPI); |
656 | bfin_t350mcqb_enable_ppi(); | 647 | bfin_t350mcqb_enable_ppi(); |
657 | 648 | ||
@@ -664,7 +655,7 @@ static int bfin_t350mcqb_resume(struct platform_device *pdev) | |||
664 | 655 | ||
665 | static struct platform_driver bfin_t350mcqb_driver = { | 656 | static struct platform_driver bfin_t350mcqb_driver = { |
666 | .probe = bfin_t350mcqb_probe, | 657 | .probe = bfin_t350mcqb_probe, |
667 | .remove = bfin_t350mcqb_remove, | 658 | .remove = __devexit_p(bfin_t350mcqb_remove), |
668 | .suspend = bfin_t350mcqb_suspend, | 659 | .suspend = bfin_t350mcqb_suspend, |
669 | .resume = bfin_t350mcqb_resume, | 660 | .resume = bfin_t350mcqb_resume, |
670 | .driver = { | 661 | .driver = { |
@@ -673,7 +664,7 @@ static struct platform_driver bfin_t350mcqb_driver = { | |||
673 | }, | 664 | }, |
674 | }; | 665 | }; |
675 | 666 | ||
676 | static int __devinit bfin_t350mcqb_driver_init(void) | 667 | static int __init bfin_t350mcqb_driver_init(void) |
677 | { | 668 | { |
678 | return platform_driver_register(&bfin_t350mcqb_driver); | 669 | return platform_driver_register(&bfin_t350mcqb_driver); |
679 | } | 670 | } |