media: nxp: imx8-isi: Drop unused argument to mxc_isi_channel_chain()

The bypass argument to the mxc_isi_channel_chain() function is unused.
Drop it.

Link: https://lore.kernel.org/r/20250813225501.20762-1-laurent.pinchart@ideasonboard.com
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
index d86f5ede0c0e99ae364b2f6926124cafb241a41e..5789e54f9428f0815be8e7f9d6bb7fa847e3f095 100644 (file)
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
@@ -361,7 +361,7 @@ void mxc_isi_channel_get(struct mxc_isi_pipe *pipe);
 void mxc_isi_channel_put(struct mxc_isi_pipe *pipe);
 void mxc_isi_channel_enable(struct mxc_isi_pipe *pipe);
 void mxc_isi_channel_disable(struct mxc_isi_pipe *pipe);
-int mxc_isi_channel_chain(struct mxc_isi_pipe *pipe, bool bypass);
+int mxc_isi_channel_chain(struct mxc_isi_pipe *pipe);
 void mxc_isi_channel_unchain(struct mxc_isi_pipe *pipe);
 
 void mxc_isi_channel_config(struct mxc_isi_pipe *pipe,

diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c
index 5623914f95e649000a353f4eb8ecc3b02e9a0a95..9225a7ac1c3ee7e42e64983982eb4b6c27e356fe 100644 (file)
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c
@@ -587,7 +587,7 @@ void mxc_isi_channel_release(struct mxc_isi_pipe *pipe)
  *
  * TODO: Support secondary line buffer for downscaling YUV420 images.
  */
-int mxc_isi_channel_chain(struct mxc_isi_pipe *pipe, bool bypass)
+int mxc_isi_channel_chain(struct mxc_isi_pipe *pipe)
 {
        /* Channel chaining requires both line and output buffer. */
        const u8 resources = MXC_ISI_CHANNEL_RES_OUTPUT_BUF

diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
index 5501214cc6c0ce3e0188ae6d4ff4ae277b975911..e36781c5522e0a9d87584397185c996b8b0570ca 100644 (file)
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
@@ -491,7 +491,6 @@ static int mxc_isi_m2m_streamon(struct file *file, void *fh,
        const struct mxc_isi_format_info *cap_info = ctx->queues.cap.info;
        const struct mxc_isi_format_info *out_info = ctx->queues.out.info;
        struct mxc_isi_m2m *m2m = ctx->m2m;
-       bool bypass;
        int ret;
 
        if (q->streaming)
@@ -504,15 +503,15 @@ static int mxc_isi_m2m_streamon(struct file *file, void *fh,
                goto unlock;
        }
 
-       bypass = cap_pix->width == out_pix->width &&
-                cap_pix->height == out_pix->height &&
-                cap_info->encoding == out_info->encoding;
-
        /*
         * Acquire the pipe and initialize the channel with the first user of
         * the M2M device.
         */
        if (m2m->usage_count == 0) {
+               bool bypass = cap_pix->width == out_pix->width &&
+                             cap_pix->height == out_pix->height &&
+                             cap_info->encoding == out_info->encoding;
+
                ret = mxc_isi_channel_acquire(m2m->pipe,
                                              &mxc_isi_m2m_frame_write_done,
                                              bypass);
@@ -529,7 +528,7 @@ static int mxc_isi_m2m_streamon(struct file *file, void *fh,
         * buffer chaining.
         */
        if (!ctx->chained && out_pix->width > MXC_ISI_MAX_WIDTH_UNCHAINED) {
-               ret = mxc_isi_channel_chain(m2m->pipe, bypass);
+               ret = mxc_isi_channel_chain(m2m->pipe);
                if (ret)
                        goto deinit;
 

diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c
index d76eb58deb096b26fa41b1e262754faec8e3f26c..a41c51dd9ce0f2eeb779e9aa2461593b0d635f41 100644 (file)
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c
@@ -855,7 +855,7 @@ int mxc_isi_pipe_acquire(struct mxc_isi_pipe *pipe,
 
        /* Chain the channel if needed for wide resolutions. */
        if (sink_fmt->width > MXC_ISI_MAX_WIDTH_UNCHAINED) {
-               ret = mxc_isi_channel_chain(pipe, bypass);
+               ret = mxc_isi_channel_chain(pipe);
                if (ret)
                        mxc_isi_channel_release(pipe);
        }