Skip to content

Commit

Permalink
OMAPDSS: VENC: Remove cpu_is_xxxx checks
Browse files Browse the repository at this point in the history
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" (ba02fa3) by Tomi Valkeinen <tomi.valkeinen@ti.com> and
"OMAPDSS: VENC: fix NULL pointer dereference in DSS2 VENC sysfs debug attr on
OMAP4" (cc1d3e0)  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>
  • Loading branch information
Chandrabhanu Mahapatra authored and Tomi Valkeinen committed Aug 22, 2012
1 parent 572bbd5 commit ee223b7
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions drivers/video/omap2/dss/venc.c
Original file line number Diff line number Diff line change
Expand Up @@ -674,11 +674,6 @@ static void venc_dump_regs(struct seq_file *s)
{
#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, venc_read_reg(r))

if (cpu_is_omap44xx()) {
seq_printf(s, "VENC currently disabled on OMAP44xx\n");
return;
}

if (venc_runtime_get())
return;

Expand Down Expand Up @@ -893,16 +888,10 @@ static struct platform_driver omap_venchw_driver = {

int __init venc_init_platform_driver(void)
{
if (cpu_is_omap44xx())
return 0;

return platform_driver_probe(&omap_venchw_driver, omap_venchw_probe);
}

void __exit venc_uninit_platform_driver(void)
{
if (cpu_is_omap44xx())
return;

platform_driver_unregister(&omap_venchw_driver);
}

0 comments on commit ee223b7

Please sign in to comment.