From patchwork Fri Nov 25 13:34:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Volodymyr Kharuk X-Patchwork-Id: 628747 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84FEDC4332F for ; Fri, 25 Nov 2022 13:34:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229757AbiKYNef (ORCPT ); Fri, 25 Nov 2022 08:34:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229462AbiKYNed (ORCPT ); Fri, 25 Nov 2022 08:34:33 -0500 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41E7027CE6 for ; Fri, 25 Nov 2022 05:34:32 -0800 (PST) Received: by mail-ej1-x631.google.com with SMTP id n21so10362423ejb.9 for ; Fri, 25 Nov 2022 05:34:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=melexis.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ry6vpBY5sEcwGbAi4otGsLxf2CvPTMM0zzHiIX66/tg=; b=lNjZhZsVw9SepEAJAvetf9jj5ohdUcEXTXCVNVMiWkYMjXQk4uqQNxN5LjmYOeCaDI MaYi2Ot+VyZoyXImKm6V4cQAdpbN1gqTBYM7EVr6BiUKMhfqvvZuvVqNKgTfiuRhm6oi tyJffXGKPo3k/LUmKM30YiWbFONvoDSbE8N1nmTOns8uVe0Gfp5jWvzwuJvdVI0kLAwE bDRA4mCEAYsaI27FOKH3rKSbctfEY+A9+bS+xhHAM9dXe/kcN+JTDXOxcvoABRGGZMgc ++LZZw7cUGXH8UHlRmEXeKLpz4RKDAbUdzZCelmS2lkCvCywqmjim5AZzakZDh0a3Zc7 GGhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ry6vpBY5sEcwGbAi4otGsLxf2CvPTMM0zzHiIX66/tg=; b=LbDn8CcPwjDR12uV7LWaAxqkOecBM/B7E5kRrtqUrCIy+0Y9ymSLaBA0yiPjBLdtBG y5cs34SZZLSFrj478MMgB/fUP8968vYm/4nU91NQmto8AkGkOhfNDdmZ7hGUdYdQj1Gd cm7Z0CVnT7Me3mYHcPPLfx1lPikYqIuCacRn6pGA+UFh+sAN0LQBwHkiwUDKqFVTLs6N iupjfJGXjbZyCSUuXSp11VtpdZqHio6oIvYLyZASHSC8WvgHz7pbl/H4x+Lvm1XfxSPt fy3t2ohCWAZcLxpJQsEj6RmK58Nf9iZjbdPbeyBBjz0FCEzlIRDn3nWvdiGxKdr1qAzW B01w== X-Gm-Message-State: ANoB5pmKdeIugWBqTMSMiPCy40CaG/mK7M2ZK3xPkcQvlQ/tVibYHq9A s4xYkGUTM1VgUld2xY8AQDG37fIK5pdn+IB8cxGQy+2IOtI2bObK3Dlw9yhS/zRcYJngC339697 9JV2rGiRtAZbpLOAna1Y3DNmvwdfcUtNJhoSQtKlMlIobqbR2jYmeoREPpFicBVhhbGhtVt5d X-Google-Smtp-Source: AA0mqf6kRhk2EjjqrWhMFX3g0KVhqqNd7hVw4EI4r3WBaQWa/ea4cW9nHdFtbGOB9pQ4fWtI3sRraA== X-Received: by 2002:a17:906:14c2:b0:78d:554f:fb16 with SMTP id y2-20020a17090614c200b0078d554ffb16mr32345835ejc.151.1669383271778; Fri, 25 Nov 2022 05:34:31 -0800 (PST) Received: from melexis ([2a02:2378:1085:b41d:1fad:f315:d8eb:738b]) by smtp.gmail.com with ESMTPSA id fe9-20020a1709072a4900b007ae0fde7a9asm1560886ejc.201.2022.11.25.05.34.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 05:34:31 -0800 (PST) From: Volodymyr Kharuk To: Cc: Andrii Kyselov , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Laurent Pinchart , devicetree@vger.kernel.org, Hans Verkuil , Sakari Ailus , Benjamin Mugnier , Volodymyr Kharuk Subject: [PATCH v3 4/8] media: v4l: ctrls-api: Allow array update in __v4l2_ctrl_modify_range Date: Fri, 25 Nov 2022 15:34:07 +0200 Message-Id: <1758f7525f6c8c602f36eef5e07a97ddfb1b548f.1669381013.git.vkh@melexis.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org For V4L2_CID_TOF_TINT, which is dynamic array, it is required to use __v4l2_ctrl_modify_range. So the idea is to use type_ops instead of u64 from union. It will allow to work with any type. Signed-off-by: Volodymyr Kharuk --- drivers/media/v4l2-core/v4l2-ctrls-api.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-ctrls-api.c b/drivers/media/v4l2-core/v4l2-ctrls-api.c index d0a3aa3806fb..09735644a2f1 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-api.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-api.c @@ -942,8 +942,6 @@ int __v4l2_ctrl_modify_range(struct v4l2_ctrl *ctrl, case V4L2_CTRL_TYPE_U8: case V4L2_CTRL_TYPE_U16: case V4L2_CTRL_TYPE_U32: - if (ctrl->is_array) - return -EINVAL; ret = check_range(ctrl->type, min, max, step, def); if (ret) return ret; @@ -960,17 +958,10 @@ int __v4l2_ctrl_modify_range(struct v4l2_ctrl *ctrl, ctrl->default_value = def; } cur_to_new(ctrl); - if (validate_new(ctrl, ctrl->p_new)) { - if (ctrl->type == V4L2_CTRL_TYPE_INTEGER64) - *ctrl->p_new.p_s64 = def; - else - *ctrl->p_new.p_s32 = def; - } + if (validate_new(ctrl, ctrl->p_new)) + ctrl->type_ops->init(ctrl, 0, ctrl->p_new); - if (ctrl->type == V4L2_CTRL_TYPE_INTEGER64) - value_changed = *ctrl->p_new.p_s64 != *ctrl->p_cur.p_s64; - else - value_changed = *ctrl->p_new.p_s32 != *ctrl->p_cur.p_s32; + value_changed = !ctrl->type_ops->equal(ctrl, ctrl->p_cur, ctrl->p_new); if (value_changed) ret = set_ctrl(NULL, ctrl, V4L2_EVENT_CTRL_CH_RANGE); else if (range_changed)