aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2
diff options
context:
space:
mode:
authorChandrabhanu Mahapatra <cmahapatra@ti.com>2012-08-01 03:03:31 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-08-22 04:43:04 -0400
commitee223b703033ccfc2a47c3bb3e7352b4f5828fd2 (patch)
tree415598c24c6dd3841e179930133cbc7f6f857673 /drivers/video/omap2
parent572bbd58e16a2c6a8c1fec274de9af3523f1506b (diff)
OMAPDSS: VENC: Remove cpu_is_xxxx checks
OMAP4 checks are removed from VENC to provide it a cleaner interface. These checks were introduced by patches "HACK: OMAP: DSS2: VENC: disable VENC on OMAP4 to prevent crash" (ba02fa37de) by Tomi Valkeinen <tomi.valkeinen@ti.com> and "OMAPDSS: VENC: fix NULL pointer dereference in DSS2 VENC sysfs debug attr on OMAP4" (cc1d3e032d) by Danny Kukawka <danny.kukawka@bisect.de> to prevent VENC from crashing OMAP4 kernel. Signed-off-by: Chandrabhanu Mahapatra <cmahapatra@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2')
-rw-r--r--drivers/video/omap2/dss/venc.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 7d3eef8a010f..4a6caf9c6da3 100644
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -674,11 +674,6 @@ static void venc_dump_regs(struct seq_file *s)
674{ 674{
675#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, venc_read_reg(r)) 675#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, venc_read_reg(r))
676 676
677 if (cpu_is_omap44xx()) {
678 seq_printf(s, "VENC currently disabled on OMAP44xx\n");
679 return;
680 }
681
682 if (venc_runtime_get()) 677 if (venc_runtime_get())
683 return; 678 return;
684 679
@@ -893,16 +888,10 @@ static struct platform_driver omap_venchw_driver = {
893 888
894int __init venc_init_platform_driver(void) 889int __init venc_init_platform_driver(void)
895{ 890{
896 if (cpu_is_omap44xx())
897 return 0;
898
899 return platform_driver_probe(&omap_venchw_driver, omap_venchw_probe); 891 return platform_driver_probe(&omap_venchw_driver, omap_venchw_probe);
900} 892}
901 893
902void __exit venc_uninit_platform_driver(void) 894void __exit venc_uninit_platform_driver(void)
903{ 895{
904 if (cpu_is_omap44xx())
905 return;
906
907 platform_driver_unregister(&omap_venchw_driver); 896 platform_driver_unregister(&omap_venchw_driver);
908} 897}