---

yaml --- r: 371332 b: refs/heads/master c: 3db716b h: refs/heads/master v: v3
git-mirror · Apr 3, 2013 · ba47a49 · ba47a49
1 parent e4cf9cc
commit ba47a49
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31030985450977d978a1781111a4ddadb86c4ae8
+refs/heads/master: 3db716bca710b5f0f1749c058532728d21b85bfc
diff --git a/trunk/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c b/trunk/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
@@ -125,21 +125,13 @@ static int sharp_ls_power_on(struct omap_dss_device *dssdev)
 	/* wait couple of vsyncs until enabling the LCD */
 	msleep(50);
 
-	if (dssdev->platform_enable) {
-		r = dssdev->platform_enable(dssdev);
-		if (r)
-			goto err1;
-	}
-
 	if (gpio_is_valid(pd->resb_gpio))
 		gpio_set_value_cansleep(pd->resb_gpio, 1);
 
 	if (gpio_is_valid(pd->ini_gpio))
 		gpio_set_value_cansleep(pd->ini_gpio, 1);
 
 	return 0;
-err1:
-	omapdss_dpi_display_disable(dssdev);
 err0:
 	return r;
 }
@@ -157,9 +149,6 @@ static void sharp_ls_power_off(struct omap_dss_device *dssdev)
 	if (gpio_is_valid(pd->resb_gpio))
 		gpio_set_value_cansleep(pd->resb_gpio, 0);
 
-	if (dssdev->platform_disable)
-		dssdev->platform_disable(dssdev);
-
 	/* wait at least 5 vsyncs after disabling the LCD */
 
 	msleep(100);