From e35b87dd7c4cb9e4afe83d44eee21a049f8ac89e Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Tue, 4 Dec 2012 15:43:38 +0530 Subject: [PATCH] --- yaml --- r: 371339 b: refs/heads/master c: b3fb8b98bbb896132dc123aa460caf9d53372636 h: refs/heads/master i: 371337: ddd616a86947938c75dbb64594963c0113b695d6 371335: ca0dc6381509ff83c86f5163d419947c27a2a107 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/displays/panel-picodlp.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index e6abc903691d..57ab24293b19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d52e2e7557eace36e7eb731bbd40ed3588eb0f1b +refs/heads/master: b3fb8b98bbb896132dc123aa460caf9d53372636 diff --git a/trunk/drivers/video/omap2/displays/panel-picodlp.c b/trunk/drivers/video/omap2/displays/panel-picodlp.c index bc8ac77f8827..62f2db04fbc8 100644 --- a/trunk/drivers/video/omap2/displays/panel-picodlp.c +++ b/trunk/drivers/video/omap2/displays/panel-picodlp.c @@ -354,12 +354,6 @@ static int picodlp_panel_power_on(struct omap_dss_device *dssdev) struct picodlp_data *picod = dev_get_drvdata(&dssdev->dev); struct picodlp_panel_data *picodlp_pdata = get_panel_data(dssdev); - if (dssdev->platform_enable) { - r = dssdev->platform_enable(dssdev); - if (r) - return r; - } - gpio_set_value(picodlp_pdata->pwrgood_gpio, 0); msleep(1); gpio_set_value(picodlp_pdata->pwrgood_gpio, 1); @@ -398,9 +392,6 @@ static int picodlp_panel_power_on(struct omap_dss_device *dssdev) err: omapdss_dpi_display_disable(dssdev); err1: - if (dssdev->platform_disable) - dssdev->platform_disable(dssdev); - return r; } @@ -412,9 +403,6 @@ static void picodlp_panel_power_off(struct omap_dss_device *dssdev) gpio_set_value(picodlp_pdata->emu_done_gpio, 0); gpio_set_value(picodlp_pdata->pwrgood_gpio, 0); - - if (dssdev->platform_disable) - dssdev->platform_disable(dssdev); } static int picodlp_panel_probe(struct omap_dss_device *dssdev)