gpu: ipu-v3: Remove unused ipu_image_convert_* functions

ipu_image_convert_enum_format() and ipu_image_convert_sync() were both
added in 2016 by
commit cd98e85a6b78 ("gpu: ipu-v3: Add queued image conversion support")

but have remained unused.

Remove them.

ipu_image_convert_sync() was the last user of
image_convert_sync_complete().

Remove it.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20241226022752.219399-5-linux@treblig.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --git a/drivers/gpu/ipu-v3/ipu-image-convert.c b/drivers/gpu/ipu-v3/ipu-image-convert.c
index 8413165..3c33b4d 100644 (file)
--- a/drivers/gpu/ipu-v3/ipu-image-convert.c
+++ b/drivers/gpu/ipu-v3/ipu-image-convert.c
@@ -355,20 +355,6 @@ static void dump_format(struct ipu_image_convert_ctx *ctx,
                (ic_image->fmt->fourcc >> 24) & 0xff);
 }
 
-int ipu_image_convert_enum_format(int index, u32 *fourcc)
-{
-       const struct ipu_image_pixfmt *fmt;
-
-       if (index >= (int)ARRAY_SIZE(image_convert_formats))
-               return -EINVAL;
-
-       /* Format found */
-       fmt = &image_convert_formats[index];
-       *fourcc = fmt->fourcc;
-       return 0;
-}
-EXPORT_SYMBOL_GPL(ipu_image_convert_enum_format);
-
 static void free_dma_buf(struct ipu_image_convert_priv *priv,
                         struct ipu_image_convert_dma_buf *buf)
 {
@@ -2437,40 +2423,6 @@ ipu_image_convert(struct ipu_soc *ipu, enum ipu_ic_task ic_task,
 }
 EXPORT_SYMBOL_GPL(ipu_image_convert);
 
-/* "Canned" synchronous single image conversion */
-static void image_convert_sync_complete(struct ipu_image_convert_run *run,
-                                       void *data)
-{
-       struct completion *comp = data;
-
-       complete(comp);
-}
-
-int ipu_image_convert_sync(struct ipu_soc *ipu, enum ipu_ic_task ic_task,
-                          struct ipu_image *in, struct ipu_image *out,
-                          enum ipu_rotate_mode rot_mode)
-{
-       struct ipu_image_convert_run *run;
-       struct completion comp;
-       int ret;
-
-       init_completion(&comp);
-
-       run = ipu_image_convert(ipu, ic_task, in, out, rot_mode,
-                               image_convert_sync_complete, &comp);
-       if (IS_ERR(run))
-               return PTR_ERR(run);
-
-       ret = wait_for_completion_timeout(&comp, msecs_to_jiffies(10000));
-       ret = (ret == 0) ? -ETIMEDOUT : 0;
-
-       ipu_image_convert_unprepare(run->ctx);
-       kfree(run);
-
-       return ret;
-}
-EXPORT_SYMBOL_GPL(ipu_image_convert_sync);
-
 int ipu_image_convert_init(struct ipu_soc *ipu, struct device *dev)
 {
        struct ipu_image_convert_priv *priv;

diff --git a/include/video/imx-ipu-image-convert.h b/include/video/imx-ipu-image-convert.h
index 3c71b8b..003b392 100644 (file)
--- a/include/video/imx-ipu-image-convert.h
+++ b/include/video/imx-ipu-image-convert.h
@@ -40,19 +40,6 @@ struct ipu_image_convert_run {
 typedef void (*ipu_image_convert_cb_t)(struct ipu_image_convert_run *run,
                                       void *ctx);
 
-/**
- * ipu_image_convert_enum_format() - enumerate the image converter's
- *     supported input and output pixel formats.
- *
- * @index:     pixel format index
- * @fourcc:    v4l2 fourcc for this index
- *
- * Returns 0 with a valid index and fills in v4l2 fourcc, -EINVAL otherwise.
- *
- * In V4L2, drivers can call ipu_image_enum_format() in .enum_fmt.
- */
-int ipu_image_convert_enum_format(int index, u32 *fourcc);
-
 /**
  * ipu_image_convert_adjust() - adjust input/output images to IPU restrictions.
  *
@@ -176,23 +163,4 @@ ipu_image_convert(struct ipu_soc *ipu, enum ipu_ic_task ic_task,
                  ipu_image_convert_cb_t complete,
                  void *complete_context);
 
-/**
- * ipu_image_convert_sync() - synchronous single image conversion request
- *
- * @ipu:       the IPU handle to use for the conversion
- * @ic_task:   the IC task to use for the conversion
- * @in:                input image format
- * @out:       output image format
- * @rot_mode:  rotation mode
- *
- * Carry out a single image conversion. Returns when the conversion
- * completes. The input/output formats and rotation mode must already
- * meet IPU retrictions. The created context is automatically unprepared
- * and the run freed on return.
- */
-int ipu_image_convert_sync(struct ipu_soc *ipu, enum ipu_ic_task ic_task,
-                          struct ipu_image *in, struct ipu_image *out,
-                          enum ipu_rotate_mode rot_mode);
-
-
 #endif /* __IMX_IPU_IMAGE_CONVERT_H__ */