1 files changed, 3 insertions, 14 deletions

diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index a243e65b870f..d18c8e290c85 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -261,9 +261,6 @@ struct dsi_data {
         struct clk *dss_clk;
         struct clk *sys_clk;
 
-        int (*enable_pads)(int dsi_id, unsigned lane_mask);
-        void (*disable_pads)(int dsi_id, unsigned lane_mask);
-
         struct dsi_clock_info current_cinfo;
 
         bool vdds_dsi_enabled;
@@ -2306,7 +2303,7 @@ static int dsi_cio_init(struct omap_dss_device *dssdev)
 
         DSSDBGF();
 
-        r = dsi->enable_pads(dsi_get_dsidev_id(dsidev), dsi_get_lane_mask(dssdev));
+        r = dss_dsi_enable_pads(dsi_get_dsidev_id(dsidev), dsi_get_lane_mask(dssdev));
         if (r)
                 return r;
 
@@ -2416,21 +2413,20 @@ err_cio_pwr:
                 dsi_cio_disable_lane_override(dsidev);
 err_scp_clk_dom:
         dsi_disable_scp_clk(dsidev);
-        dsi->disable_pads(dsi_get_dsidev_id(dsidev), dsi_get_lane_mask(dssdev));
+        dss_dsi_disable_pads(dsi_get_dsidev_id(dsidev), dsi_get_lane_mask(dssdev));
         return r;
 }
 
 static void dsi_cio_uninit(struct omap_dss_device *dssdev)
 {
         struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
-        struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
 
         /* DDR_CLK_ALWAYS_ON */
         REG_FLD_MOD(dsidev, DSI_CLK_CTRL, 0, 13, 13);
 
         dsi_cio_power(dsidev, DSI_COMPLEXIO_POWER_OFF);
         dsi_disable_scp_clk(dsidev);
-        dsi->disable_pads(dsi_get_dsidev_id(dsidev), dsi_get_lane_mask(dssdev));
+        dss_dsi_disable_pads(dsi_get_dsidev_id(dsidev), dsi_get_lane_mask(dssdev));
 }
 
 static void dsi_config_tx_fifo(struct platform_device *dsidev,
@@ -4645,8 +4641,6 @@ static void dsi_put_clocks(struct platform_device *dsidev)
 /* DSI1 HW IP initialisation */
 static int omap_dsihw_probe(struct platform_device *dsidev)
 {
-        struct omap_display_platform_data *dss_plat_data;
-        struct omap_dss_board_info *board_info;
         u32 rev;
         int r, i, dsi_module = dsi_get_dsidev_id(dsidev);
         struct resource *dsi_mem;
@@ -4660,11 +4654,6 @@ static int omap_dsihw_probe(struct platform_device *dsidev)
         dsi_pdev_map[dsi_module] = dsidev;
         dev_set_drvdata(&dsidev->dev, dsi);
 
-        dss_plat_data = dsidev->dev.platform_data;
-        board_info = dss_plat_data->board_data;
-        dsi->enable_pads = board_info->dsi_enable_pads;
-        dsi->disable_pads = board_info->dsi_disable_pads;
-
         spin_lock_init(&dsi->irq_lock);
         spin_lock_init(&dsi->errors_lock);
         dsi->errors = 0;