media: amphion: Remove unused functions

The functions:
  vpu_color_get_default()
  vpu_color_check_full_range()
  vpu_color_check_primaries()
  vpu_color_check_transfers()
  vpu_color_check_matrix()

have been unused since 2022's
commit 1925665ef403 ("media: amphion: remove redundant check of
colorspace in venc_s_fmt")

The (empty) function vpu_mbox_enable_rx() has been unused since it
was added in 2022 by the
commit 61cbf1c1fa6d ("media: amphion: implement vpu core communication
based on mailbox")

Remove them.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/platform/amphion/vpu_color.c b/drivers/media/platform/amphion/vpu_color.c
index 4ae435cbc5cda215a375dfa394066eb1ba7ce1dc..7c0ab8289a7bf542b0772fe87d67bd959a21a092 100644 (file)
--- a/drivers/media/platform/amphion/vpu_color.c
+++ b/drivers/media/platform/amphion/vpu_color.c
@@ -108,76 +108,3 @@ u32 vpu_color_cvrt_full_range_i2v(u32 full_range)
 
        return V4L2_QUANTIZATION_LIM_RANGE;
 }
-
-int vpu_color_check_primaries(u32 primaries)
-{
-       return vpu_color_cvrt_primaries_v2i(primaries) ? 0 : -EINVAL;
-}
-
-int vpu_color_check_transfers(u32 transfers)
-{
-       return vpu_color_cvrt_transfers_v2i(transfers) ? 0 : -EINVAL;
-}
-
-int vpu_color_check_matrix(u32 matrix)
-{
-       return vpu_color_cvrt_matrix_v2i(matrix) ? 0 : -EINVAL;
-}
-
-int vpu_color_check_full_range(u32 full_range)
-{
-       int ret = -EINVAL;
-
-       switch (full_range) {
-       case V4L2_QUANTIZATION_FULL_RANGE:
-       case V4L2_QUANTIZATION_LIM_RANGE:
-               ret = 0;
-               break;
-       default:
-               break;
-       }
-
-       return ret;
-}
-
-int vpu_color_get_default(u32 primaries, u32 *ptransfers, u32 *pmatrix, u32 *pfull_range)
-{
-       u32 transfers;
-       u32 matrix;
-       u32 full_range;
-
-       switch (primaries) {
-       case V4L2_COLORSPACE_REC709:
-               transfers = V4L2_XFER_FUNC_709;
-               matrix = V4L2_YCBCR_ENC_709;
-               break;
-       case V4L2_COLORSPACE_470_SYSTEM_M:
-       case V4L2_COLORSPACE_470_SYSTEM_BG:
-       case V4L2_COLORSPACE_SMPTE170M:
-               transfers = V4L2_XFER_FUNC_709;
-               matrix = V4L2_YCBCR_ENC_601;
-               break;
-       case V4L2_COLORSPACE_SMPTE240M:
-               transfers = V4L2_XFER_FUNC_SMPTE240M;
-               matrix = V4L2_YCBCR_ENC_SMPTE240M;
-               break;
-       case V4L2_COLORSPACE_BT2020:
-               transfers = V4L2_XFER_FUNC_709;
-               matrix = V4L2_YCBCR_ENC_BT2020;
-               break;
-       default:
-               transfers = V4L2_XFER_FUNC_DEFAULT;
-               matrix = V4L2_YCBCR_ENC_DEFAULT;
-               break;
-       }
-       full_range = V4L2_QUANTIZATION_LIM_RANGE;
-
-       if (ptransfers)
-               *ptransfers = transfers;
-       if (pmatrix)
-               *pmatrix = matrix;
-       if (pfull_range)
-               *pfull_range = full_range;
-
-       return 0;
-}

diff --git a/drivers/media/platform/amphion/vpu_helpers.h b/drivers/media/platform/amphion/vpu_helpers.h
index 0eaddb07190de2d1d87a16b73a15d872e58f9eaf..84d16eb396506125b10c4471384721e1b99d2950 100644 (file)
--- a/drivers/media/platform/amphion/vpu_helpers.h
+++ b/drivers/media/platform/amphion/vpu_helpers.h
@@ -54,10 +54,6 @@ static inline u8 vpu_helper_read_byte(struct vpu_buffer *stream_buffer, u32 pos)
        return pdata[pos % stream_buffer->length];
 }
 
-int vpu_color_check_primaries(u32 primaries);
-int vpu_color_check_transfers(u32 transfers);
-int vpu_color_check_matrix(u32 matrix);
-int vpu_color_check_full_range(u32 full_range);
 u32 vpu_color_cvrt_primaries_v2i(u32 primaries);
 u32 vpu_color_cvrt_primaries_i2v(u32 primaries);
 u32 vpu_color_cvrt_transfers_v2i(u32 transfers);
@@ -66,7 +62,6 @@ u32 vpu_color_cvrt_matrix_v2i(u32 matrix);
 u32 vpu_color_cvrt_matrix_i2v(u32 matrix);
 u32 vpu_color_cvrt_full_range_v2i(u32 full_range);
 u32 vpu_color_cvrt_full_range_i2v(u32 full_range);
-int vpu_color_get_default(u32 primaries, u32 *ptransfers, u32 *pmatrix, u32 *pfull_range);
 
 int vpu_find_dst_by_src(struct vpu_pair *pairs, u32 cnt, u32 src);
 int vpu_find_src_by_dst(struct vpu_pair *pairs, u32 cnt, u32 dst);

diff --git a/drivers/media/platform/amphion/vpu_mbox.c b/drivers/media/platform/amphion/vpu_mbox.c
index c2963b8deb480e1de9a6b7941fba11553d9ffc98..b2ac8de6a2d9dcbdd317b9d7c76586ee792800bf 100644 (file)
--- a/drivers/media/platform/amphion/vpu_mbox.c
+++ b/drivers/media/platform/amphion/vpu_mbox.c
@@ -109,7 +109,3 @@ void vpu_mbox_send_msg(struct vpu_core *core, u32 type, u32 data)
        mbox_send_message(core->tx_data.ch, &data);
        mbox_send_message(core->tx_type.ch, &type);
 }
-
-void vpu_mbox_enable_rx(struct vpu_dev *dev)
-{
-}

diff --git a/drivers/media/platform/amphion/vpu_mbox.h b/drivers/media/platform/amphion/vpu_mbox.h
index 79cfd874e92bf85782bffaf64383f965a3bfb255..8b7aea4f606cedc35473247634acbd95456cda71 100644 (file)
--- a/drivers/media/platform/amphion/vpu_mbox.h
+++ b/drivers/media/platform/amphion/vpu_mbox.h
@@ -11,6 +11,5 @@ int vpu_mbox_request(struct vpu_core *core);
 void vpu_mbox_free(struct vpu_core *core);
 void vpu_mbox_send_msg(struct vpu_core *core, u32 type, u32 data);
 void vpu_mbox_send_type(struct vpu_core *core, u32 type);
-void vpu_mbox_enable_rx(struct vpu_dev *dev);
 
 #endif