On Mon, 23 May 2022 at 14:25, Vladimir Zapolskiy
<vladimir.zapolskiy@xxxxxxxxxx> wrote:
>
> Common exported functions msm_vfe_get_vfe_id() and msm_vfe_get_vfe_line_id()
> do not have any users outside of camss-ispif.c, move them to the latter
> object and staticize.
>
> The change is supposed to be a non-functional one.
>
> Signed-off-by: Vladimir Zapolskiy <vladimir.zapolskiy@xxxxxxxxxx>
> ---
> .../media/platform/qcom/camss/camss-ispif.c | 39 ++++++++++++++++++-
> drivers/media/platform/qcom/camss/camss-vfe.c | 34 ----------------
> drivers/media/platform/qcom/camss/camss-vfe.h | 3 --
> 3 files changed, 37 insertions(+), 39 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/media/platform/qcom/camss/camss-ispif.c
> index 4ee11bb979cd..91e6a2b9ac50 100644
> --- a/drivers/media/platform/qcom/camss/camss-ispif.c
> +++ b/drivers/media/platform/qcom/camss/camss-ispif.c
> @@ -1252,6 +1252,41 @@ static enum ispif_intf ispif_get_intf(enum vfe_line_id line_id)
> }
> }
>
> +/*
> + * ispif_get_vfe_id - Get VFE HW module id
> + * @entity: Pointer to VFE media entity structure
> + * @id: Return CSID HW module id here
> + */
> +static void ispif_get_vfe_id(struct media_entity *entity, u8 *id)
> +{
> + struct v4l2_subdev *sd;
> + struct vfe_line *line;
> + struct vfe_device *vfe;
> +
> + sd = media_entity_to_v4l2_subdev(entity);
> + line = v4l2_get_subdevdata(sd);
> + vfe = to_vfe(line);
> +
> + *id = vfe->id;
> +}
> +
> +/*
> + * ispif_get_vfe_line_id - Get VFE line id by media entity
> + * @entity: Pointer to VFE media entity structure
> + * @id: Return VFE line id here
> + */
> +static void ispif_get_vfe_line_id(struct media_entity *entity,
> + enum vfe_line_id *id)
> +{
> + struct v4l2_subdev *sd;
> + struct vfe_line *line;
> +
> + sd = media_entity_to_v4l2_subdev(entity);
> + line = v4l2_get_subdevdata(sd);
> +
> + *id = line->id;
> +}
> +
> /*
> * ispif_link_setup - Setup ISPIF connections
> * @entity: Pointer to media entity structure
> @@ -1285,8 +1320,8 @@ static int ispif_link_setup(struct media_entity *entity,
> sd = media_entity_to_v4l2_subdev(entity);
> line = v4l2_get_subdevdata(sd);
>
> - msm_vfe_get_vfe_id(remote->entity, &line->vfe_id);
> - msm_vfe_get_vfe_line_id(remote->entity, &id);
> + ispif_get_vfe_id(remote->entity, &line->vfe_id);
> + ispif_get_vfe_line_id(remote->entity, &id);
> line->interface = ispif_get_intf(id);
> }
> }
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
> index 5b148e9f8134..76e28b832568 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe.c
> @@ -1422,40 +1422,6 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
> return 0;
> }
>
> -/*
> - * msm_vfe_get_vfe_id - Get VFE HW module id
> - * @entity: Pointer to VFE media entity structure
> - * @id: Return CSID HW module id here
> - */
> -void msm_vfe_get_vfe_id(struct media_entity *entity, u8 *id)
> -{
> - struct v4l2_subdev *sd;
> - struct vfe_line *line;
> - struct vfe_device *vfe;
> -
> - sd = media_entity_to_v4l2_subdev(entity);
> - line = v4l2_get_subdevdata(sd);
> - vfe = to_vfe(line);
> -
> - *id = vfe->id;
> -}
> -
> -/*
> - * msm_vfe_get_vfe_line_id - Get VFE line id by media entity
> - * @entity: Pointer to VFE media entity structure
> - * @id: Return VFE line id here
> - */
> -void msm_vfe_get_vfe_line_id(struct media_entity *entity, enum vfe_line_id *id)
> -{
> - struct v4l2_subdev *sd;
> - struct vfe_line *line;
> -
> - sd = media_entity_to_v4l2_subdev(entity);
> - line = v4l2_get_subdevdata(sd);
> -
> - *id = line->id;
> -}
> -
> /*
> * vfe_link_setup - Setup VFE connections
> * @entity: Pointer to media entity structure
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/platform/qcom/camss/camss-vfe.h
> index 0eba04eb9b77..cbc314c4e244 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe.h
> +++ b/drivers/media/platform/qcom/camss/camss-vfe.h
> @@ -163,9 +163,6 @@ int msm_vfe_register_entities(struct vfe_device *vfe,
>
> void msm_vfe_unregister_entities(struct vfe_device *vfe);
>
> -void msm_vfe_get_vfe_id(struct media_entity *entity, u8 *id);
> -void msm_vfe_get_vfe_line_id(struct media_entity *entity, enum vfe_line_id *id);
> -
> /*
> * vfe_buf_add_pending - Add output buffer to list of pending
> * @output: VFE output
Reviewed-by: Robert Foss <robert.foss@xxxxxxxxxx>
