From 78caf95279cf9c4cb942fecd062e4edcd10dbd4d Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Tue, 12 Feb 2013 15:11:42 +0530 Subject: [PATCH] --- yaml --- r: 371341 b: refs/heads/master c: af9f6c35563079cb0ea9b429983914cd4e2c24f3 h: refs/heads/master i: 371339: e35b87dd7c4cb9e4afe83d44eee21a049f8ac89e v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/displays/panel-n8x0.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 9b4cfce96a13..7125dc5a6bfc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64f938974ee39686b017ebe4b6087aa55e2f0a82 +refs/heads/master: af9f6c35563079cb0ea9b429983914cd4e2c24f3 diff --git a/trunk/drivers/video/omap2/displays/panel-n8x0.c b/trunk/drivers/video/omap2/displays/panel-n8x0.c index c146a3d215e2..f94ead6a3183 100644 --- a/trunk/drivers/video/omap2/displays/panel-n8x0.c +++ b/trunk/drivers/video/omap2/displays/panel-n8x0.c @@ -295,12 +295,6 @@ static int n8x0_panel_power_on(struct omap_dss_device *dssdev) gpio_direction_output(bdata->ctrl_pwrdown, 1); - if (bdata->platform_enable) { - r = bdata->platform_enable(dssdev); - if (r) - goto err_plat_en; - } - omapdss_rfbi_set_size(dssdev, dssdev->panel.timings.x_res, dssdev->panel.timings.y_res); omapdss_rfbi_set_pixel_size(dssdev, dssdev->ctrl.pixel_size); @@ -373,9 +367,6 @@ static int n8x0_panel_power_on(struct omap_dss_device *dssdev) err_inv_chip: omapdss_rfbi_display_disable(dssdev); err_rfbi_en: - if (bdata->platform_disable) - bdata->platform_disable(dssdev); -err_plat_en: gpio_direction_output(bdata->ctrl_pwrdown, 0); return r; } @@ -392,9 +383,6 @@ static void n8x0_panel_power_off(struct omap_dss_device *dssdev) send_display_off(spi); send_sleep_in(spi); - if (bdata->platform_disable) - bdata->platform_disable(dssdev); - /* * HACK: we should turn off the panel here, but there is some problem * with the initialization sequence, and we fail to init the panel if we