[PATCH v7 47/54] drm/omap: dpi: Simplify clock setting API

[Laurent Pinchart]

The dpi_set_pll_clk() and dpi_set_dispc_clk() return various information
through pointer arguments that are never used by the callers. Remove
them to simplify the clock setting API.

Signed-off-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkei...@ti.com>
Tested-by: Sebastian Reichel <sebastian.reic...@collabora.com>
Reviewed-by: Sebastian Reichel <sebastian.reic...@collabora.com>
---
 drivers/gpu/drm/omapdrm/dss/dpi.c | 32 ++++++++-----------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c 
b/drivers/gpu/drm/omapdrm/dss/dpi.c
index dccf81e4ce64..c167bd1116ec 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -287,9 +287,7 @@ static bool dpi_dss_clk_calc(struct dpi_data *dpi, unsigned 
long pck,
 
 
 
-static int dpi_set_pll_clk(struct dpi_data *dpi, enum omap_channel channel,
-               unsigned long pck_req, unsigned long *fck, int *lck_div,
-               int *pck_div)
+static int dpi_set_pll_clk(struct dpi_data *dpi, unsigned long pck_req)
 {
        struct dpi_clk_calc_ctx ctx;
        int r;
@@ -303,19 +301,15 @@ static int dpi_set_pll_clk(struct dpi_data *dpi, enum 
omap_channel channel,
        if (r)
                return r;
 
-       dss_select_lcd_clk_source(dpi->dss, channel, dpi->clk_src);
+       dss_select_lcd_clk_source(dpi->dss, dpi->output.dispc_channel,
+                                 dpi->clk_src);
 
        dpi->mgr_config.clock_info = ctx.dispc_cinfo;
 
-       *fck = ctx.pll_cinfo.clkout[ctx.clkout_idx];
-       *lck_div = ctx.dispc_cinfo.lck_div;
-       *pck_div = ctx.dispc_cinfo.pck_div;
-
        return 0;
 }
 
-static int dpi_set_dispc_clk(struct dpi_data *dpi, unsigned long pck_req,
-               unsigned long *fck, int *lck_div, int *pck_div)
+static int dpi_set_dispc_clk(struct dpi_data *dpi, unsigned long pck_req)
 {
        struct dpi_clk_calc_ctx ctx;
        int r;
@@ -331,29 +325,19 @@ static int dpi_set_dispc_clk(struct dpi_data *dpi, 
unsigned long pck_req,
 
        dpi->mgr_config.clock_info = ctx.dispc_cinfo;
 
-       *fck = ctx.fck;
-       *lck_div = ctx.dispc_cinfo.lck_div;
-       *pck_div = ctx.dispc_cinfo.pck_div;
-
        return 0;
 }
 
 static int dpi_set_mode(struct dpi_data *dpi)
 {
-       int lck_div = 0, pck_div = 0;
-       unsigned long fck = 0;
-       int r = 0;
+       int r;
 
        if (dpi->pll)
-               r = dpi_set_pll_clk(dpi, dpi->output.dispc_channel,
-                                   dpi->pixelclock, &fck, &lck_div, &pck_div);
+               r = dpi_set_pll_clk(dpi, dpi->pixelclock);
        else
-               r = dpi_set_dispc_clk(dpi, dpi->pixelclock, &fck,
-                               &lck_div, &pck_div);
-       if (r)
-               return r;
+               r = dpi_set_dispc_clk(dpi, dpi->pixelclock);
 
-       return 0;
+       return r;
 }
 
 static void dpi_config_lcd_manager(struct dpi_data *dpi)
-- 
Regards,

Laurent Pinchart

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel