瀏覽代碼

OMAP: DSS2: Remove unneeded cpu_is_xxx checks

cpu_is_omapxxx() was used previously to select the supported interfaces.
Now that the interfaces are platform devices, we no longer need to do
the check when registering the driver. Thus we can just remove the
checks.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tomi Valkeinen 14 年之前
父節點
當前提交
0a58351854
共有 1 個文件被更改,包括 6 次插入12 次删除
  1. 6 12
      drivers/video/omap2/dss/core.c

+ 6 - 12
drivers/video/omap2/dss/core.c

@@ -203,12 +203,10 @@ static int omap_dss_probe(struct platform_device *pdev)
 		goto err_venc;
 	}
 
-	if (cpu_is_omap34xx()) {
-		r = dsi_init_platform_driver();
-		if (r) {
-			DSSERR("Failed to initialize DSI platform driver\n");
-			goto err_dsi;
-		}
+	r = dsi_init_platform_driver();
+	if (r) {
+		DSSERR("Failed to initialize DSI platform driver\n");
+		goto err_dsi;
 	}
 
 	r = dss_initialize_debugfs();
@@ -240,8 +238,7 @@ static int omap_dss_probe(struct platform_device *pdev)
 err_register:
 	dss_uninitialize_debugfs();
 err_debugfs:
-	if (cpu_is_omap34xx())
-		dsi_uninit_platform_driver();
+	dsi_uninit_platform_driver();
 err_dsi:
 	venc_uninit_platform_driver();
 err_venc:
@@ -265,10 +262,7 @@ static int omap_dss_remove(struct platform_device *pdev)
 	venc_uninit_platform_driver();
 	dispc_uninit_platform_driver();
 	rfbi_uninit_platform_driver();
-	if (cpu_is_omap34xx()) {
-		dsi_uninit_platform_driver();
-	}
-
+	dsi_uninit_platform_driver();
 	dss_uninit_platform_driver();
 
 	dss_uninit_overlays(pdev);