On Wed, Sep 07, 2022 at 11:04:23PM +0300, Laurent Pinchart wrote:
> The imx_media_find_subdev_by_fwnode(),
> imx_media_find_subdev_by_devname(), imx_media_pipeline_csi2_channel()
> and imx_media_pipeline_video_device() helper functions are not used.
> Drop them.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Reviewed-by: Paul Elder <paul.elder@xxxxxxxxxxxxxxxx>
> ---
> drivers/staging/media/imx/imx-media-utils.c | 68 ---------------------
> drivers/staging/media/imx/imx-media.h | 10 ---
> 2 files changed, 78 deletions(-)
>
> diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c
> index 294c808b2ebe..07770b47e19b 100644
> --- a/drivers/staging/media/imx/imx-media-utils.c
> +++ b/drivers/staging/media/imx/imx-media-utils.c
> @@ -626,36 +626,6 @@ void imx_media_grp_id_to_sd_name(char *sd_name, int sz, u32 grp_id, int ipu_id)
> }
> EXPORT_SYMBOL_GPL(imx_media_grp_id_to_sd_name);
>
> -struct v4l2_subdev *
> -imx_media_find_subdev_by_fwnode(struct imx_media_dev *imxmd,
> - struct fwnode_handle *fwnode)
> -{
> - struct v4l2_subdev *sd;
> -
> - list_for_each_entry(sd, &imxmd->v4l2_dev.subdevs, list) {
> - if (sd->fwnode == fwnode)
> - return sd;
> - }
> -
> - return NULL;
> -}
> -EXPORT_SYMBOL_GPL(imx_media_find_subdev_by_fwnode);
> -
> -struct v4l2_subdev *
> -imx_media_find_subdev_by_devname(struct imx_media_dev *imxmd,
> - const char *devname)
> -{
> - struct v4l2_subdev *sd;
> -
> - list_for_each_entry(sd, &imxmd->v4l2_dev.subdevs, list) {
> - if (!strcmp(devname, dev_name(sd->dev)))
> - return sd;
> - }
> -
> - return NULL;
> -}
> -EXPORT_SYMBOL_GPL(imx_media_find_subdev_by_devname);
> -
> /*
> * Adds a video device to the master video device list. This is called
> * when a video device is registered.
> @@ -756,25 +726,6 @@ find_pipeline_entity(struct media_entity *start, u32 grp_id,
> return pad ? pad->entity : NULL;
> }
>
> -/*
> - * Find the upstream mipi-csi2 virtual channel reached from the given
> - * start entity in the current pipeline.
> - * Must be called with mdev->graph_mutex held.
> - */
> -int imx_media_pipeline_csi2_channel(struct media_entity *start_entity)
> -{
> - struct media_pad *pad;
> - int ret = -EPIPE;
> -
> - pad = imx_media_pipeline_pad(start_entity, IMX_MEDIA_GRP_ID_CSI2,
> - 0, true);
> - if (pad)
> - ret = pad->index - 1;
> -
> - return ret;
> -}
> -EXPORT_SYMBOL_GPL(imx_media_pipeline_csi2_channel);
> -
> /*
> * Find a subdev reached upstream from the given start entity in
> * the current pipeline.
> @@ -794,25 +745,6 @@ imx_media_pipeline_subdev(struct media_entity *start_entity, u32 grp_id,
> }
> EXPORT_SYMBOL_GPL(imx_media_pipeline_subdev);
>
> -/*
> - * Find a subdev reached upstream from the given start entity in
> - * the current pipeline.
> - * Must be called with mdev->graph_mutex held.
> - */
> -struct video_device *
> -imx_media_pipeline_video_device(struct media_entity *start_entity,
> - enum v4l2_buf_type buftype, bool upstream)
> -{
> - struct media_entity *me;
> -
> - me = find_pipeline_entity(start_entity, 0, buftype, upstream);
> - if (!me)
> - return ERR_PTR(-ENODEV);
> -
> - return media_entity_to_video_device(me);
> -}
> -EXPORT_SYMBOL_GPL(imx_media_pipeline_video_device);
> -
> /*
> * Find a fwnode endpoint that maps to the given subdevice's pad.
> * If there are multiple endpoints that map to the pad, only the
> diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h
> index 5e794f291da6..5a1436dbb12d 100644
> --- a/drivers/staging/media/imx/imx-media.h
> +++ b/drivers/staging/media/imx/imx-media.h
> @@ -201,24 +201,14 @@ int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,
> const struct imx_media_pixfmt *cc);
> void imx_media_grp_id_to_sd_name(char *sd_name, int sz,
> u32 grp_id, int ipu_id);
> -struct v4l2_subdev *
> -imx_media_find_subdev_by_fwnode(struct imx_media_dev *imxmd,
> - struct fwnode_handle *fwnode);
> -struct v4l2_subdev *
> -imx_media_find_subdev_by_devname(struct imx_media_dev *imxmd,
> - const char *devname);
> void imx_media_add_video_device(struct imx_media_dev *imxmd,
> struct imx_media_video_dev *vdev);
> -int imx_media_pipeline_csi2_channel(struct media_entity *start_entity);
> struct media_pad *
> imx_media_pipeline_pad(struct media_entity *start_entity, u32 grp_id,
> enum v4l2_buf_type buftype, bool upstream);
> struct v4l2_subdev *
> imx_media_pipeline_subdev(struct media_entity *start_entity, u32 grp_id,
> bool upstream);
> -struct video_device *
> -imx_media_pipeline_video_device(struct media_entity *start_entity,
> - enum v4l2_buf_type buftype, bool upstream);
> struct fwnode_handle *imx_media_get_pad_fwnode(struct media_pad *pad);
>
> struct imx_media_dma_buf {
