From: Archit Taneja Date: Tue, 12 Feb 2013 09:40:14 +0000 (+0530) Subject: OMAPDSS: generic dpi panel: remove uses of platform_enable/disable ops X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7e930086e739c9eb5bd9ccd2017f26aa87153dd8;p=linux-beck.git OMAPDSS: generic dpi panel: remove uses of platform_enable/disable ops The generic dpi panel driver now sets the gpios required to configure the panel. This was previously done in platform_enable/disable callbacks in board files. All the board files using generic dpi panel now correctly pass the gpio related information as platform data, which is needed by the panel driver to configure the panel. Hence, the platform_enable/disable ops can be safely removed now. Signed-off-by: Archit Taneja --- diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c index 5c75e4de073c..97363f733683 100644 --- a/drivers/video/omap2/displays/panel-generic-dpi.c +++ b/drivers/video/omap2/displays/panel-generic-dpi.c @@ -553,20 +553,13 @@ static int generic_dpi_panel_power_on(struct omap_dss_device *dssdev) if (panel_config->power_on_delay) msleep(panel_config->power_on_delay); - if (panel_data->platform_enable) { - r = panel_data->platform_enable(dssdev); - if (r) - goto err1; - } - for (i = 0; i < panel_data->num_gpios; ++i) { gpio_set_value_cansleep(panel_data->gpios[i], panel_data->gpio_invert[i] ? 0 : 1); } return 0; -err1: - omapdss_dpi_display_disable(dssdev); + err0: return r; } @@ -586,9 +579,6 @@ static void generic_dpi_panel_power_off(struct omap_dss_device *dssdev) panel_data->gpio_invert[i] ? 1 : 0); } - if (panel_data->platform_disable) - panel_data->platform_disable(dssdev); - /* wait couple of vsyncs after disabling the LCD */ if (panel_config->power_off_delay) msleep(panel_config->power_off_delay);