drm/mediatek: Rename mtk_ddp_comp functions

Rename functions of mtk_ddp_comp:
- To align the naming rule
- To reduce the code size

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: CK Hu <ck.hu@mediatek.com>
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20240322091232.26387-15-shawn.sung@mediatek.com/
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>

diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
index c3441508f452f42015f7fffe4cc0576a98bb8387..17b0364112922af35dfe10f2e1d818b3fe0478c3 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
@@ -497,10 +497,10 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_DRM_ID_MAX]
        [DDP_COMPONENT_WDMA1]           = { MTK_DISP_WDMA,              1, NULL },
 };
 
-static bool mtk_drm_find_comp_in_ddp(struct device *dev,
-                                    const unsigned int *path,
-                                    unsigned int path_len,
-                                    struct mtk_ddp_comp *ddp_comp)
+static bool mtk_ddp_comp_find(struct device *dev,
+                             const unsigned int *path,
+                             unsigned int path_len,
+                             struct mtk_ddp_comp *ddp_comp)
 {
        unsigned int i;
 
@@ -514,10 +514,10 @@ static bool mtk_drm_find_comp_in_ddp(struct device *dev,
        return false;
 }
 
-static unsigned int mtk_drm_find_comp_in_ddp_conn_path(struct device *dev,
-                                                      const struct mtk_drm_route *routes,
-                                                      unsigned int num_routes,
-                                                      struct mtk_ddp_comp *ddp_comp)
+static unsigned int mtk_ddp_comp_find_in_route(struct device *dev,
+                                              const struct mtk_drm_route *routes,
+                                              unsigned int num_routes,
+                                              struct mtk_ddp_comp *ddp_comp)
 {
        int ret;
        unsigned int i;
@@ -554,26 +554,31 @@ int mtk_ddp_comp_get_id(struct device_node *node,
        return -EINVAL;
 }
 
-unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,
-                                               struct device *dev)
+unsigned int mtk_find_possible_crtcs(struct drm_device *drm, struct device *dev)
 {
        struct mtk_drm_private *private = drm->dev_private;
        unsigned int ret = 0;
 
-       if (mtk_drm_find_comp_in_ddp(dev, private->data->main_path, private->data->main_len,
-                                    private->ddp_comp))
+       if (mtk_ddp_comp_find(dev,
+                             private->data->main_path,
+                             private->data->main_len,
+                             private->ddp_comp))
                ret = BIT(0);
-       else if (mtk_drm_find_comp_in_ddp(dev, private->data->ext_path,
-                                         private->data->ext_len, private->ddp_comp))
+       else if (mtk_ddp_comp_find(dev,
+                                  private->data->ext_path,
+                                  private->data->ext_len,
+                                  private->ddp_comp))
                ret = BIT(1);
-       else if (mtk_drm_find_comp_in_ddp(dev, private->data->third_path,
-                                         private->data->third_len, private->ddp_comp))
+       else if (mtk_ddp_comp_find(dev,
+                                  private->data->third_path,
+                                  private->data->third_len,
+                                  private->ddp_comp))
                ret = BIT(2);
        else
-               ret = mtk_drm_find_comp_in_ddp_conn_path(dev,
-                                                        private->data->conn_routes,
-                                                        private->data->num_conn_routes,
-                                                        private->ddp_comp);
+               ret = mtk_ddp_comp_find_in_route(dev,
+                                                private->data->conn_routes,
+                                                private->data->num_conn_routes,
+                                                private->ddp_comp);
 
        return ret;
 }

diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
index ba985206fdd24ee3abd744c06711885c0f650c90..26236691ce4c29a108660ca9d7b47b3a1cab777f 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
+++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
@@ -326,8 +326,7 @@ static inline void mtk_ddp_comp_encoder_index_set(struct mtk_ddp_comp *comp)
 
 int mtk_ddp_comp_get_id(struct device_node *node,
                        enum mtk_ddp_comp_type comp_type);
-unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,
-                                               struct device *dev);
+unsigned int mtk_find_possible_crtcs(struct drm_device *drm, struct device *dev);
 int mtk_ddp_comp_init(struct device_node *comp_node, struct mtk_ddp_comp *comp,
                      unsigned int comp_id);
 enum mtk_ddp_comp_type mtk_ddp_comp_get_type(unsigned int comp_id);

diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
index fbf63e04413371c2de6875fead9dd2390a94a1f1..bfe8653005dbfd03abafe33d53da5ec1366d69af 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -805,7 +805,7 @@ static int mtk_dpi_bind(struct device *dev, struct device *master, void *data)
                return ret;
        }
 
-       dpi->encoder.possible_crtcs = mtk_drm_find_possible_crtc_by_comp(drm_dev, dpi->dev);
+       dpi->encoder.possible_crtcs = mtk_find_possible_crtcs(drm_dev, dpi->dev);
 
        ret = drm_bridge_attach(&dpi->encoder, &dpi->bridge, NULL,
                                DRM_BRIDGE_ATTACH_NO_CONNECTOR);

diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index e29c37fb5be092b7b24eda185c2ed9724fad9516..67239606adbfc7d137885ac7cdedc1d7e0f1d3e0 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -836,7 +836,7 @@ static int mtk_dsi_encoder_init(struct drm_device *drm, struct mtk_dsi *dsi)
                return ret;
        }
 
-       dsi->encoder.possible_crtcs = mtk_drm_find_possible_crtc_by_comp(drm, dsi->host.dev);
+       dsi->encoder.possible_crtcs = mtk_find_possible_crtcs(drm, dsi->host.dev);
 
        ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL,
                                DRM_BRIDGE_ATTACH_NO_CONNECTOR);