From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50B94285CA7 for ; Mon, 5 Jan 2026 21:18:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767647892; cv=none; b=rWyD2Zb8wvNFlllSkWe5FDh0HYA+qdo2Yc7PSaKwrHgV61/HQYkBPZTmfkK20SJ1MDAxjs8j8FxOBuw26OVSJaP9n3niLUDp2le4SWNK9R/Vb0fj+K0+CJC4TzzQWW6J691Gh22RAYxmW7CL1xfiyMAutKMRKvIA3vyn5uxPmfw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767647892; c=relaxed/simple; bh=Ty8qAOgYDVTGzyl0Dryi/luGmvpGSIX0Nk28S//O/4A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TNV9j8waf3QfAkr9Th7krvXRkh1tBkppP3d6Ivrq9FOEAjsfomayWwpuB9RPsHhbRXlBvb+C4CyNjAS8zXmWUaHd2DKbe3yljI8DHf7jxRTLgPKQMxQErpYkezIHUkQrLPoV1jmQqCQ4U+vGY4RkyyiPzzL7UwsoiK+0oJ7s9Go= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VVZStDtI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VVZStDtI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88A7AC2BC86; Mon, 5 Jan 2026 21:18:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767647892; bh=Ty8qAOgYDVTGzyl0Dryi/luGmvpGSIX0Nk28S//O/4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VVZStDtIlr/kt1ng8Antap4mszfRGiskRcMzkDclY+P73kd3a4fA7+lRKyzyIlsA5 yh7aqTch04nnqynuE47CPIllB2iKoxMqz1MaO2cEUA2tSF69YzoMt9oHQvG02LEs4u SWbURgl7bx9EgFOprvZBBelzWx/4+LefF8wRELgr/l/60hSqJPPvZ1q+g9EWM82iIJ nZz152eUqGdDnxasCD8hxZY3BFb/pBuyMdEQw3b46QNSOKlT9oizDC2E5UPEHFQ0/p 64URSbP6hBXHxUGudIIvPKULPIsYCFsDaTi/x65B3yROufcx4ZCuCWTtNvYb+ArAWO f+w1pI2fzFdrA== From: Sasha Levin To: stable@vger.kernel.org Cc: Laurent Pinchart , Ming Qian , Hans Verkuil , Sasha Levin Subject: [PATCH 6.6.y 2/3] media: amphion: Make some vpu_v4l2 functions static Date: Mon, 5 Jan 2026 16:18:08 -0500 Message-ID: <20260105211809.2802485-2-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260105211809.2802485-1-sashal@kernel.org> References: <2026010509-cardstock-selection-ef9d@gregkh> <20260105211809.2802485-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Laurent Pinchart [ Upstream commit 5d1e54bb4dc6741284a3ed587e994308ddee2f16 ] Some functions defined in vpu_v4l2.c are never used outside of that compilation unit. Make them static. Signed-off-by: Laurent Pinchart Reviewed-by: Ming Qian Signed-off-by: Hans Verkuil Stable-dep-of: 634c2cd17bd0 ("media: amphion: Remove vpu_vb_is_codecconfig") Signed-off-by: Sasha Levin --- drivers/media/platform/amphion/vpu_v4l2.c | 12 +++++++++--- drivers/media/platform/amphion/vpu_v4l2.h | 8 -------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/platform/amphion/vpu_v4l2.c index 75084ba8f93b..e122603b37e8 100644 --- a/drivers/media/platform/amphion/vpu_v4l2.c +++ b/drivers/media/platform/amphion/vpu_v4l2.c @@ -24,6 +24,11 @@ #include "vpu_msgs.h" #include "vpu_helpers.h" +static char *vpu_type_name(u32 type) +{ + return V4L2_TYPE_IS_OUTPUT(type) ? "output" : "capture"; +} + void vpu_inst_lock(struct vpu_inst *inst) { mutex_lock(&inst->lock); @@ -42,7 +47,7 @@ dma_addr_t vpu_get_vb_phy_addr(struct vb2_buffer *vb, u32 plane_no) vb->planes[plane_no].data_offset; } -unsigned int vpu_get_vb_length(struct vb2_buffer *vb, u32 plane_no) +static unsigned int vpu_get_vb_length(struct vb2_buffer *vb, u32 plane_no) { if (plane_no >= vb->num_planes) return 0; @@ -74,7 +79,7 @@ void vpu_v4l2_set_error(struct vpu_inst *inst) vpu_inst_unlock(inst); } -int vpu_notify_eos(struct vpu_inst *inst) +static int vpu_notify_eos(struct vpu_inst *inst) { static const struct v4l2_event ev = { .id = 0, @@ -546,7 +551,8 @@ static void vpu_vb2_buf_finish(struct vb2_buffer *vb) call_void_vop(inst, on_queue_empty, q->type); } -void vpu_vb2_buffers_return(struct vpu_inst *inst, unsigned int type, enum vb2_buffer_state state) +static void vpu_vb2_buffers_return(struct vpu_inst *inst, unsigned int type, + enum vb2_buffer_state state) { struct vb2_v4l2_buffer *buf; diff --git a/drivers/media/platform/amphion/vpu_v4l2.h b/drivers/media/platform/amphion/vpu_v4l2.h index 60f43056a7a2..064f61773f62 100644 --- a/drivers/media/platform/amphion/vpu_v4l2.h +++ b/drivers/media/platform/amphion/vpu_v4l2.h @@ -25,15 +25,12 @@ void vpu_skip_frame(struct vpu_inst *inst, int count); struct vb2_v4l2_buffer *vpu_find_buf_by_sequence(struct vpu_inst *inst, u32 type, u32 sequence); struct vb2_v4l2_buffer *vpu_find_buf_by_idx(struct vpu_inst *inst, u32 type, u32 idx); void vpu_v4l2_set_error(struct vpu_inst *inst); -int vpu_notify_eos(struct vpu_inst *inst); int vpu_notify_source_change(struct vpu_inst *inst); int vpu_set_last_buffer_dequeued(struct vpu_inst *inst, bool eos); -void vpu_vb2_buffers_return(struct vpu_inst *inst, unsigned int type, enum vb2_buffer_state state); int vpu_get_num_buffers(struct vpu_inst *inst, u32 type); bool vpu_is_source_empty(struct vpu_inst *inst); dma_addr_t vpu_get_vb_phy_addr(struct vb2_buffer *vb, u32 plane_no); -unsigned int vpu_get_vb_length(struct vb2_buffer *vb, u32 plane_no); static inline struct vpu_format *vpu_get_format(struct vpu_inst *inst, u32 type) { if (V4L2_TYPE_IS_OUTPUT(type)) @@ -42,11 +39,6 @@ static inline struct vpu_format *vpu_get_format(struct vpu_inst *inst, u32 type) return &inst->cap_format; } -static inline char *vpu_type_name(u32 type) -{ - return V4L2_TYPE_IS_OUTPUT(type) ? "output" : "capture"; -} - static inline int vpu_vb_is_codecconfig(struct vb2_v4l2_buffer *vbuf) { #ifdef V4L2_BUF_FLAG_CODECCONFIG -- 2.51.0