Commit ee223b70 authored Aug 01, 2012 by Chandrabhanu Mahapatra Committed by Tomi Valkeinen Aug 22, 2012

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" (ba02fa37) by Tomi Valkeinen <tomi.valkeinen@ti.com> and
"OMAPDSS: VENC: fix NULL pointer dereference in DSS2 VENC sysfs debug attr on
OMAP4" (cc1d3e03) 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>

parent 572bbd58

drivers/video/omap2/dss/venc.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -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;

		@@ -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);
		}