From patchwork Mon Jul 26 08:01:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 485812 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp3577595jao; Mon, 26 Jul 2021 01:01:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrBKLtsjgjcFF2+My4xeVqEsbtgz+I4cYBvmEzHAbGqfgBqvuYBeHuvMBpgqy+WOhaAlVY X-Received: by 2002:a92:c503:: with SMTP id r3mr12379156ilg.148.1627286495709; Mon, 26 Jul 2021 01:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627286495; cv=none; d=google.com; s=arc-20160816; b=ERA3InESwWYEhYVvJuS183ZgtZM6bSW7WL4bXPbLspVM+AMQidzz/DGsc3XK7PRYIC NptIwMNNBcA+pFx6JEVpatQ6TAIW+SxNaryF1pf4YuA0OUBUr5ZUBCTmO4Fp8zeeG4W1 Xaxjp6Ef8ysZYbvyEJF/k1kYrGZweqO4VTaBlpR5BEk/2jgqbm+xQxzJbWHlNWjXLVjQ dct/K5VEJxL/5ELqpE3OT9AJ9Yl2mqjUlFkIPG8H/ntjx3dUtg1JtTQdhs3goy7e+9eU AE1MoCEommtQsaXSXusCyw2xbvMoMN8+hK625jooudFY2/6X/+DffiDhzLbQ8PNlXJM9 xS8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:to:from:dkim-signature; bh=XVU7ml1tVdiZFg6w+28rjELN1plpC5pGFmNpVPCTBNY=; b=iuDc4kxZtRXtSQ9GKTmQqCeQ92fk+2C7bCqWGKIUcZjrtSfKOYoZZKLjrhXyRrtKMF xM/b3BcIc9vjRMhhetace+sta3T1x/vJf5uhVWwwaOdAjt8jc9rWWfqA809L7nmgCdxs 2/gdNy0Ui4MiqjiDy6tFRCbSv6O+ETM/+92LfyGNtv9QZ0WUqqVKddFIswTrFvQ5R7T3 DeZaHRr38wraC1VsskRg7Pq2m6yFh9JtE3+xHQN3Bp7zTy8aDyYNtSaKor/Hgn6myTqC JV/ehd+mmkyclPruG8YGU73XH0ogeoLV1d8WaXSCpYewpk6c/9WPLzkwKl8sE10ubqUR +1tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pDUI+baG; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p10si35444739iov.66.2021.07.26.01.01.35; Mon, 26 Jul 2021 01:01:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pDUI+baG; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232762AbhGZHVF (ORCPT + 17 others); Mon, 26 Jul 2021 03:21:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232295AbhGZHVF (ORCPT ); Mon, 26 Jul 2021 03:21:05 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F878C061764 for ; Mon, 26 Jul 2021 01:01:34 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id l4-20020a05600c1d04b02902506f89ad2dso1620218wms.1 for ; Mon, 26 Jul 2021 01:01:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=XVU7ml1tVdiZFg6w+28rjELN1plpC5pGFmNpVPCTBNY=; b=pDUI+baGvQhmx8t1mPXkz7Joiv/BQk/c7tVLlGPQgUBLWm8kIYc9t2fVXRPYOjKKdA ZMKekfpBtpH4b8wkyuMKxPQiqDqld1Il1anFrMAytJQrDFwiFQ3YW5bWp5BXxJjxQ+hQ MEs9OmTTU6YOCAijyRnyRD3SnQa7uPhQU3885bOu0CNREjcfclNxVosgEDZmgV7GzC4L MxbmxG/R6s90T6ZhP2Kb8Vx0BW9i9NBvgin3XT0BzsHwGD0pv66Akga/0PBNfrcVEqb1 1NlhGK9ksrrYl4W5fNmaFwCfifjCeMDVa6NIQfUPrrxk9Mabfx0SEemj5ThIAZuxLAJ7 jtDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=XVU7ml1tVdiZFg6w+28rjELN1plpC5pGFmNpVPCTBNY=; b=JSRjTKYvehi1l93v5s6b2myxyqpRuRGH49ptUZpdP/CPoIwypYueSsMbEmJp5v5hC4 5qaWGb+8cJjusqOI7qHb/loS9jZ7BEzSGmghUuUlctu1TAH115aEGCuQtVhWqivxfv0w lOaLDNtNKUjNw+SNiAZiPqtzOnhNQczq6h/FMDwP2G33huqGSBfkfQ0j39Ku7jIDI0U5 JPPG6M86TD4LihCevlpYtRoll5I/DaHSOSk2T08kHUdpNfn0dsJVWzloIRzzz4P34dOF PB2ZPx1uAC4qjwyYnZz8R0F460x0T4kEWk+/6y8LTySGopFFFzoe/26PMc10XFnH6J9q HuxQ== X-Gm-Message-State: AOAM532zYsAPQ8YZev//HJ3/cQGiTPb94Sb6U1DzNC1NhSDNyCGBdHcZ 7BFWLnVObhrO59QzkNxIdzmI1A== X-Received: by 2002:a1c:ed0a:: with SMTP id l10mr15858978wmh.151.1627286492553; Mon, 26 Jul 2021 01:01:32 -0700 (PDT) Received: from qcom-hackbox.linaro.org.net (163-172-5-244.rev.poneytelecom.eu. [163.172.5.244]) by smtp.gmail.com with ESMTPSA id n8sm460600wrx.46.2021.07.26.01.01.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 01:01:32 -0700 (PDT) From: Robert Foss To: robert.foss@linaro.org, todor.too@gmail.com, agross@kernel.org, bjorn.andersson@linaro.org, mchehab@kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Andrey Konovalov , AngeloGioacchino Del Regno Subject: [PATCH v1 1/4] media: camss: vfe: Don't read hardware version needlessly Date: Mon, 26 Jul 2021 10:01:10 +0200 Message-Id: <20210726080113.8378-1-robert.foss@linaro.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org vfe_set_power() is invoced a few times, which causes a lot of VFE HW version prints. Secondly there is no real reason for calling hw_version_read() from this location specifically, since it does nothing more than print the VFE HW version. A better location for the hw_version_read() call would be somewhere which is only executed once per VFE unit. Signed-off-by: Robert Foss --- drivers/media/platform/qcom/camss/camss-vfe.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.29.2 diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c index e0f3a36f3f3f..f6e889c1598e 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.c +++ b/drivers/media/platform/qcom/camss/camss-vfe.c @@ -713,8 +713,6 @@ static int vfe_set_power(struct v4l2_subdev *sd, int on) ret = vfe_get(vfe); if (ret < 0) return ret; - - vfe->ops->hw_version_read(vfe, vfe->camss->dev); } else { vfe_put(vfe); } @@ -1301,6 +1299,7 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, return -EINVAL; } vfe->ops->subdev_init(dev, vfe); + vfe->ops->hw_version_read(vfe, dev); /* Memory */ From patchwork Mon Jul 26 08:01:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 485813 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp3577615jao; Mon, 26 Jul 2021 01:01:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz8X9d0t0RP8N9afNjuT5Q7CBJv8HQ1872uJQai8xFF50XnL2vAuP0SKt0ZEOFZ9qVQRn82 X-Received: by 2002:a05:6638:6a6:: with SMTP id d6mr15113444jad.118.1627286496734; Mon, 26 Jul 2021 01:01:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627286496; cv=none; d=google.com; s=arc-20160816; b=LKJF4eJnLlYOxaOqE0dzSRiK9wQcMpgosJgyIGIo/3mm3OM1D8Z4AsXE+dopL44p4x nixbN85Phjy1w22ONt2VyVDapCZXLx1WzvJUeBvS72DNtWyvwcHwtrQDSQ26x13QwFHv YbwUX2nO9CdmEqIFiwwqJVrEMcytyA1eyrxZbGZNDOCpEPltiOBs64GtEQJWWGVd8Chh cZULobNqx8xDyBdrqIGpknbEOaICc1OMTRPOKjc5ttxezDWEdD39KxR8rtwyScgDc4To 3eYgJ6l+nyOjSKH4AASiQTWhtKvPmd+jzcEq+GY8bnGd9RC/O/y1XHMBbnnln0maUsRn WS5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=lnQL+vD1s8HHey3hE2dBo++FOKUFUU+N4j10t+DrCDk=; b=gPDN7s2ogMa6p4zEUODbz1rfewhe6X9KqnEoQgFm0jwp0gukYCaKTbnxf/DxrIh8Dv 9L78Gjgj5fkycrwPlziiMySR48VqIpaSu0TSNHvLfijRGwmsPZfJFKzxyQ5Etm9yShrC f5SoNVj6gOoApwf1zzeqDwUJq7T+ZkQGsljYDpBaBj/ZtbhHY9TaofLHmgU8brYEub7S 14rmDUvQNsU0y1e9dfEYlJwA4mDpfTU+4W878wjppuDUZiofKj1GneB/0eowPy3wwLVQ RuC/lzoUYDO/kZlVH2fieZp7a8ye3zac0+ZQgvCBLc2CQJCAC/N/wYUZy70lTD2VxDOj 8Ebg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XWI4GT5p; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p10si35444739iov.66.2021.07.26.01.01.36; Mon, 26 Jul 2021 01:01:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XWI4GT5p; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232614AbhGZHVG (ORCPT + 17 others); Mon, 26 Jul 2021 03:21:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232473AbhGZHVF (ORCPT ); Mon, 26 Jul 2021 03:21:05 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DABD4C061765 for ; Mon, 26 Jul 2021 01:01:34 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id e2so9940624wrq.6 for ; Mon, 26 Jul 2021 01:01:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=lnQL+vD1s8HHey3hE2dBo++FOKUFUU+N4j10t+DrCDk=; b=XWI4GT5p6EHHk2ueiJJfqoggE7kTlio8iWxYnh27Gc21fem4ygVKAR7aHOo2XvBbId mv9s8pYQu1ZFH+6ZRAyFyF7LK2nlRMtcm75IJbRYoOnGm7G7o4y3lMnctWLBcnyHVK33 WU8AJrf6SfcmWlRO+sS0KJ1v3T/GNNUVa5yBfphAzOHgw+APsGblzSOCCcpxjuiv7Sfc RWQNxh4xDaomUje0A/DXZKqM8JPY6L544Hs9LNiG3GmN+md+JFSnaDf5DGs6NhxsxRpb dADwamktrC4St17GYr4a4rzOqvvlDvSfgp4srX/W8rvH2V+VPfm5sxbMWDfV7DTToE4J Ptfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lnQL+vD1s8HHey3hE2dBo++FOKUFUU+N4j10t+DrCDk=; b=G27aE1OnDRYo0QjLDmrHCHxJA7USuvLtFSlqQyuccOcNVQDL6JpeWDHlkJsb9bJKTD H545+VnlbDSybpWqOKoqFLMwZfCNmdGgyuBUxFJdPKbTwbWZPEvgsa9unYIj1gtUEIrR JRkO6rqvE0IcdpOs1rDrpZmlrE3bdWLBfNxYw9uuAv+Ttqjf1JzfFQ+f/1ND0WtXd72T t2RPXJ7aXYB4RO7sJIWc+oxZzddaOgwgFeyIp+/7PLX+WCZ5AUojMYhoA8SNt/wLeQl7 wscq5eZE2QjteuVcLtNlMGKnAPjgdq82P6B7Mw/ABVQcOPRwpINGW6u+QS+0z8Wo2+jx 8vGA== X-Gm-Message-State: AOAM530CysihhaeBQV0vJMU+TNwBN7L23uzg+8WQiXiGLk4S5pDKfFVw 9LHj//x3eoVkAhgV7YL1qZAbEA== X-Received: by 2002:adf:e610:: with SMTP id p16mr18414406wrm.98.1627286493440; Mon, 26 Jul 2021 01:01:33 -0700 (PDT) Received: from qcom-hackbox.linaro.org.net (163-172-5-244.rev.poneytelecom.eu. [163.172.5.244]) by smtp.gmail.com with ESMTPSA id n8sm460600wrx.46.2021.07.26.01.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 01:01:32 -0700 (PDT) From: Robert Foss To: robert.foss@linaro.org, todor.too@gmail.com, agross@kernel.org, bjorn.andersson@linaro.org, mchehab@kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Andrey Konovalov , AngeloGioacchino Del Regno Subject: [PATCH v1 2/4] media: camss: vfe: Decrease priority of of VFE HW version to 'dbg' Date: Mon, 26 Jul 2021 10:01:11 +0200 Message-Id: <20210726080113.8378-2-robert.foss@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210726080113.8378-1-robert.foss@linaro.org> References: <20210726080113.8378-1-robert.foss@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The HW Version can in no case represent an error, so change the print priority to 'dbg'. Signed-off-by: Robert Foss --- drivers/media/platform/qcom/camss/camss-vfe-170.c | 2 +- drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 2 +- drivers/media/platform/qcom/camss/camss-vfe-4-8.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.29.2 diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c index 8594d275b41d..1ad502a1c276 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-170.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c @@ -185,7 +185,7 @@ static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev) u32 rev = (hw_version >> 16) & 0xFFF; u32 step = hw_version & 0xFFFF; - dev_err(dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step); + dev_dbg(dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step); } static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits) diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c index a59635217758..13f0fa6a7d60 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c @@ -258,7 +258,7 @@ static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev) { u32 hw_version = readl_relaxed(vfe->base + VFE_0_HW_VERSION); - dev_err(dev, "VFE HW Version = 0x%08x\n", hw_version); + dev_dbg(dev, "VFE HW Version = 0x%08x\n", hw_version); } static u16 vfe_get_ub_size(u8 vfe_id) diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-8.c b/drivers/media/platform/qcom/camss/camss-vfe-4-8.c index 998429dbb65c..03f92a6737b0 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-4-8.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-4-8.c @@ -251,7 +251,7 @@ static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev) { u32 hw_version = readl_relaxed(vfe->base + VFE_0_HW_VERSION); - dev_err(dev, "VFE HW Version = 0x%08x\n", hw_version); + dev_dbg(dev, "VFE HW Version = 0x%08x\n", hw_version); } static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits) From patchwork Mon Jul 26 08:01:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 485814 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp3577641jao; Mon, 26 Jul 2021 01:01:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwu6Wp2Sp19cJSUJ8FAZ4UHzdfDUrWKjH8FYC4oFk13SAcQ2/himjGmfl2MHX82ibEaqQsx X-Received: by 2002:a02:cf2e:: with SMTP id s14mr8595980jar.74.1627286498493; Mon, 26 Jul 2021 01:01:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627286498; cv=none; d=google.com; s=arc-20160816; b=NFuRBZan+HK5tM8i/ld3r4G3Yt7a/UW5tu9djLGYt9oWiFnBr/F6rOQ2+VINq6/vgu hbB/a7ptVenp4rtj15Ba9Q1xElUZ+SsZpVIWbXF33hNaWhSARuwMLqE4ei7gHXWMIZ2F dyYXOFzSmMqA4XyAAoYgJDedqhtBuOGe330ZgWizyMWV40r+0OKqtRAvsc3j2bdo+zZC MRHJaNEgzaTLoBPEO1eOuM+YVtVjbvgX4aC6nOzUqnL3aVxpZrBEDcJ+5IyCi7ColXg4 Wuq5LH94QaZj8zqdXwS2ye1fzLeFqVxElF7ItfGh9puTRxFTgPxzwe5RqTWlq/If0Zon pLvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=TMv5pNQLtj3z4HnxrdOEyzC4R0UvS0SYkpbtyPuEbyo=; b=pvp/mF4eorTjqexcH5nnOh56nVtJrJmFaoVjKvuDGlLWOgfMvjD1p+RH+/5WdZfYRz rcI3PB2jpj+2zJhj1uFR/IfaQrUhOMEalM19PAdOkgVXW0mju89lgZ2ohk+s0RWDJ7E+ afzw6owjsmayxQZAo5udzyTrWBXtHLh8yrQlaYreiU+JcS6rd3dJeM2SpFyFElfce6eT p7knJ7fI6Xi+zPFZqc0lVRNDGZkEcQzGSfU7T1Juz9h95ridYvJz6IlUYKxMzP+CEWvf 6x54DjwPQaSXkKH8K42djW2k26asjnxnGSRI1MvlErux2eUoFZRR9eSN+MBhWNSfSJ2e UJKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rFl+WRVs; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p10si35444739iov.66.2021.07.26.01.01.38; Mon, 26 Jul 2021 01:01:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rFl+WRVs; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232825AbhGZHVH (ORCPT + 17 others); Mon, 26 Jul 2021 03:21:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232782AbhGZHVG (ORCPT ); Mon, 26 Jul 2021 03:21:06 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94357C061760 for ; Mon, 26 Jul 2021 01:01:35 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id l18so2277990wrv.5 for ; Mon, 26 Jul 2021 01:01:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=TMv5pNQLtj3z4HnxrdOEyzC4R0UvS0SYkpbtyPuEbyo=; b=rFl+WRVs4wmrem2xToXADdWytoUjHE0sj7XJ3SYLINwx4TpuSM553Fd7LDPhiqPdsY WiVmSCR/kUOYhicF0qfv1ixQl3piuUv0KXo8wgF+lcN77h9s1ELlXFNi4pO7z2eq0VYN EolAGzqTPIv/L2js3lndvmhmFoAbnt8cz0WZtJhQa6r51Qo9LaFAK5Am5cVI0PfJWQNG jLJnhaBvUJ4ShtPbxgTmDvf4E2wf9rhHR9qGZW3Ty9JfwVvIfB4Y7KBzK8u5GTvjIaur HANX5cxvdAZRKU2Yxl8o+Y4EroLuXYWVJejNpc3TSSx8e1kBwzXjmlE9HDOri1+wJvtu WDbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TMv5pNQLtj3z4HnxrdOEyzC4R0UvS0SYkpbtyPuEbyo=; b=OUQGRvgGXDfJrzmHlMDOaDchFpFqXW0CbKUBYdWNrknc7/DxxffaVbh/3eKARzG4NC C8k9nWjFMxlx98eyUSP7YwP4b/Qko7g2GuYorH+UhBjTRz4Yal38Nhrii26IxlJaX7uk ZWRWyQVHqPabwChrtExXfH6PxVNXBYx0RMMfVZE8SUhGjr2vx2zGMgxtJdPgJ/B3nylX /9IYQQmsJKfNs/rxRga7mwSNljN5qjOUpNtennWLQZiG5TTrk0hWAXVunJkd8StgHARu Hmyl1qB4SI7V6N2RRqhrw3Qit3A8Ma82YmzNRl0q3kulnCsxhI3vfwNO0c4z4FQAy/GZ t5NQ== X-Gm-Message-State: AOAM532EsjndJWFD792TZV5n4oQlZ9ZpThIRP1NfDPS3OLgetAv6HOoy 3UMl38xw477iW53Dd8hsnqfHVg== X-Received: by 2002:a5d:58c1:: with SMTP id o1mr7078556wrf.6.1627286494233; Mon, 26 Jul 2021 01:01:34 -0700 (PDT) Received: from qcom-hackbox.linaro.org.net (163-172-5-244.rev.poneytelecom.eu. [163.172.5.244]) by smtp.gmail.com with ESMTPSA id n8sm460600wrx.46.2021.07.26.01.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 01:01:33 -0700 (PDT) From: Robert Foss To: robert.foss@linaro.org, todor.too@gmail.com, agross@kernel.org, bjorn.andersson@linaro.org, mchehab@kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Andrey Konovalov , AngeloGioacchino Del Regno Subject: [PATCH v1 3/4] media: camss: vfe: Remove vfe_hw_version_read() argument Date: Mon, 26 Jul 2021 10:01:12 +0200 Message-Id: <20210726080113.8378-3-robert.foss@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210726080113.8378-1-robert.foss@linaro.org> References: <20210726080113.8378-1-robert.foss@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The device argument is not needed, since it is accessible through the vfe_device argument already. Signed-off-by: Robert Foss --- drivers/media/platform/qcom/camss/camss-vfe-170.c | 5 +++-- drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 4 ++-- drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 4 ++-- drivers/media/platform/qcom/camss/camss-vfe-4-8.c | 4 ++-- drivers/media/platform/qcom/camss/camss-vfe.c | 2 +- drivers/media/platform/qcom/camss/camss-vfe.h | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) -- 2.29.2 diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c index 1ad502a1c276..8ef4e80a62a2 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-170.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c @@ -177,7 +177,7 @@ #define VFE_BUS_WM_FRAME_INC(n) (0x2258 + (n) * 0x100) #define VFE_BUS_WM_BURST_LIMIT(n) (0x225c + (n) * 0x100) -static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev) +static void vfe_hw_version_read(struct vfe_device *vfe) { u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION); @@ -185,7 +185,8 @@ static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev) u32 rev = (hw_version >> 16) & 0xFFF; u32 step = hw_version & 0xFFFF; - dev_dbg(dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step); + dev_dbg(vfe->camss->dev, "VFE HW Version = %u.%u.%u\n", + gen, rev, step); } static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits) diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c index 53c56a8d4545..614c266e8cd1 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c @@ -210,11 +210,11 @@ #define MSM_VFE_VFE0_UB_SIZE 1023 #define MSM_VFE_VFE0_UB_SIZE_RDI (MSM_VFE_VFE0_UB_SIZE / 3) -static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev) +static void vfe_hw_version_read(struct vfe_device *vfe) { u32 hw_version = readl_relaxed(vfe->base + VFE_0_HW_VERSION); - dev_dbg(dev, "VFE HW Version = 0x%08x\n", hw_version); + dev_dbg(vfe->camss->dev, "VFE HW Version = 0x%08x\n", hw_version); } static u16 vfe_get_ub_size(u8 vfe_id) diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c index 13f0fa6a7d60..aa175e0f6331 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c @@ -254,11 +254,11 @@ #define MSM_VFE_VFE1_UB_SIZE 1535 #define MSM_VFE_VFE1_UB_SIZE_RDI (MSM_VFE_VFE1_UB_SIZE / 3) -static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev) +static void vfe_hw_version_read(struct vfe_device *vfe) { u32 hw_version = readl_relaxed(vfe->base + VFE_0_HW_VERSION); - dev_dbg(dev, "VFE HW Version = 0x%08x\n", hw_version); + dev_dbg(vfe->camss->dev, "VFE HW Version = 0x%08x\n", hw_version); } static u16 vfe_get_ub_size(u8 vfe_id) diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-8.c b/drivers/media/platform/qcom/camss/camss-vfe-4-8.c index 03f92a6737b0..b897f5163c5d 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-4-8.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-4-8.c @@ -247,11 +247,11 @@ #define MSM_VFE_VFE1_UB_SIZE 1535 #define MSM_VFE_VFE1_UB_SIZE_RDI (MSM_VFE_VFE1_UB_SIZE / 3) -static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev) +static void vfe_hw_version_read(struct vfe_device *vfe) { u32 hw_version = readl_relaxed(vfe->base + VFE_0_HW_VERSION); - dev_dbg(dev, "VFE HW Version = 0x%08x\n", hw_version); + dev_dbg(vfe->camss->dev, "VFE HW Version = 0x%08x\n", hw_version); } static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits) diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c index f6e889c1598e..9b4f8136759c 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.c +++ b/drivers/media/platform/qcom/camss/camss-vfe.c @@ -1299,7 +1299,7 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, return -EINVAL; } vfe->ops->subdev_init(dev, vfe); - vfe->ops->hw_version_read(vfe, dev); + vfe->ops->hw_version_read(vfe); /* Memory */ diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/platform/qcom/camss/camss-vfe.h index 844b9275031d..cca251816d28 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.h +++ b/drivers/media/platform/qcom/camss/camss-vfe.h @@ -103,7 +103,7 @@ struct vfe_device; struct vfe_hw_ops { void (*enable_irq_common)(struct vfe_device *vfe); void (*global_reset)(struct vfe_device *vfe); - void (*hw_version_read)(struct vfe_device *vfe, struct device *dev); + void (*hw_version_read)(struct vfe_device *vfe); irqreturn_t (*isr)(int irq, void *dev); void (*isr_read)(struct vfe_device *vfe, u32 *value0, u32 *value1); void (*pm_domain_off)(struct vfe_device *vfe); From patchwork Mon Jul 26 08:01:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 485915 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D316C4320E for ; Mon, 26 Jul 2021 08:01:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DF7A760F0F for ; Mon, 26 Jul 2021 08:01:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232854AbhGZHVK (ORCPT ); Mon, 26 Jul 2021 03:21:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232832AbhGZHVH (ORCPT ); Mon, 26 Jul 2021 03:21:07 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76FF3C061764 for ; Mon, 26 Jul 2021 01:01:36 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id l18so2278040wrv.5 for ; Mon, 26 Jul 2021 01:01:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=upzwPoATA2+BpeywH9BXoLQjHHRdyqwMIY4xqkio9lQ=; b=PW3Pk8YRIyJNU7VgYYVV2fBp4io9wtDsiPiQRpwCkCQ30K0IVxpiYsY/Eox1dZWyhH i7QIT1JO9AI6cV9lyE5IABZRZ+bdG2rmu9pmswkSa8AzW3Qb0cHrkBY73ZO3btkM8KXj OKZ54ftbG+fu2qPkG8QF/Fx+/8jIVfwkhhdtH7bioSzEN2Z8q0UrpLFBcLAJWTtE3DLO E7IyYivgaQAJt4ZJAoUetzttgfuXGoJD5bCK+1nusHFS2Y2uqtPVQR4rwyJuDXUhDW7K Thq0eqUG/nwUn7INZg8UW1G3iMLxas3FASLDee8cBEAi45lhvMVrVUrjHCtlHnDkeUrb yCxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=upzwPoATA2+BpeywH9BXoLQjHHRdyqwMIY4xqkio9lQ=; b=MUm1NUYs2eWsnlB9pSV6Qi881afyPinGAMQsNo/wlb20ECMatauiWLv2jTlIDkaIJq mQackap5ZzvGW8VEeVgoXOXQMgKa6pprQS66dMvyhuvhlwz6y0FhPM3g4RH8uu935VKG l7fJpLOG3PoZxyA3ayDKBdWZ38yNTC0T2Q5GSlfyZA407WD7xEz4kUPaobkJQqRz1qTe hPjJKWpaTMvRanPONlbwZV22t6mhde0stp2sdnnm0AdIx2ftOKAKBl7zof2Oi1S6Kn5f 9TO8/y89WFW5ydCwWYGZiV8Ek2CwE4WwdFu1K389bl/r0xOimwqv6+PozyriBZtpyVVy Kjvw== X-Gm-Message-State: AOAM533nheao8n7BVoOnqkF17ylHY9dSW+YFdgMWj8yU5aTjD0ZTYkXS 0L5w1EIgSlwDKoQ5yx15EadX0udEINF8dw== X-Google-Smtp-Source: ABdhPJxryYLJzN6ra6Q6lvG27FVaBbl38pW8NW3STR5BtW8/UUoEpEs3NykpRMFOFcrhPeCdAPiBgg== X-Received: by 2002:adf:dd07:: with SMTP id a7mr4002764wrm.377.1627286495050; Mon, 26 Jul 2021 01:01:35 -0700 (PDT) Received: from qcom-hackbox.linaro.org.net (163-172-5-244.rev.poneytelecom.eu. [163.172.5.244]) by smtp.gmail.com with ESMTPSA id n8sm460600wrx.46.2021.07.26.01.01.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 01:01:34 -0700 (PDT) From: Robert Foss To: robert.foss@linaro.org, todor.too@gmail.com, agross@kernel.org, bjorn.andersson@linaro.org, mchehab@kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Andrey Konovalov , AngeloGioacchino Del Regno Subject: [PATCH v1 4/4] media: camss: vfe: Rework vfe_hw_version_read() function definition Date: Mon, 26 Jul 2021 10:01:13 +0200 Message-Id: <20210726080113.8378-4-robert.foss@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210726080113.8378-1-robert.foss@linaro.org> References: <20210726080113.8378-1-robert.foss@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Expose the VFE version by returning the value read from the HW_VERSION register. Secondly, change the name of this function to conform with the CSID equivalent. Signed-off-by: Robert Foss --- drivers/media/platform/qcom/camss/camss-vfe-170.c | 6 ++++-- drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 6 ++++-- drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 6 ++++-- drivers/media/platform/qcom/camss/camss-vfe-4-8.c | 6 ++++-- drivers/media/platform/qcom/camss/camss-vfe.c | 2 +- drivers/media/platform/qcom/camss/camss-vfe.h | 2 +- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c index 8ef4e80a62a2..5c083d70d495 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-170.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c @@ -177,7 +177,7 @@ #define VFE_BUS_WM_FRAME_INC(n) (0x2258 + (n) * 0x100) #define VFE_BUS_WM_BURST_LIMIT(n) (0x225c + (n) * 0x100) -static void vfe_hw_version_read(struct vfe_device *vfe) +static u32 vfe_hw_version(struct vfe_device *vfe) { u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION); @@ -187,6 +187,8 @@ static void vfe_hw_version_read(struct vfe_device *vfe) dev_dbg(vfe->camss->dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step); + + return hw_version; } static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits) @@ -772,7 +774,7 @@ static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe) const struct vfe_hw_ops vfe_ops_170 = { .global_reset = vfe_global_reset, - .hw_version_read = vfe_hw_version_read, + .hw_version = vfe_hw_version, .isr_read = vfe_isr_read, .isr = vfe_isr, .pm_domain_off = vfe_pm_domain_off, diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c index 614c266e8cd1..7b7c9a0aaab2 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c @@ -210,11 +210,13 @@ #define MSM_VFE_VFE0_UB_SIZE 1023 #define MSM_VFE_VFE0_UB_SIZE_RDI (MSM_VFE_VFE0_UB_SIZE / 3) -static void vfe_hw_version_read(struct vfe_device *vfe) +static u32 vfe_hw_version(struct vfe_device *vfe) { u32 hw_version = readl_relaxed(vfe->base + VFE_0_HW_VERSION); dev_dbg(vfe->camss->dev, "VFE HW Version = 0x%08x\n", hw_version); + + return hw_version; } static u16 vfe_get_ub_size(u8 vfe_id) @@ -1004,7 +1006,7 @@ static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe) const struct vfe_hw_ops vfe_ops_4_1 = { .global_reset = vfe_global_reset, - .hw_version_read = vfe_hw_version_read, + .hw_version = vfe_hw_version, .isr_read = vfe_isr_read, .isr = vfe_isr, .pm_domain_off = vfe_pm_domain_off, diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c index aa175e0f6331..2836b12ec989 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c @@ -254,11 +254,13 @@ #define MSM_VFE_VFE1_UB_SIZE 1535 #define MSM_VFE_VFE1_UB_SIZE_RDI (MSM_VFE_VFE1_UB_SIZE / 3) -static void vfe_hw_version_read(struct vfe_device *vfe) +static u32 vfe_hw_version(struct vfe_device *vfe) { u32 hw_version = readl_relaxed(vfe->base + VFE_0_HW_VERSION); dev_dbg(vfe->camss->dev, "VFE HW Version = 0x%08x\n", hw_version); + + return hw_version; } static u16 vfe_get_ub_size(u8 vfe_id) @@ -1196,7 +1198,7 @@ static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe) const struct vfe_hw_ops vfe_ops_4_7 = { .global_reset = vfe_global_reset, - .hw_version_read = vfe_hw_version_read, + .hw_version = vfe_hw_version, .isr_read = vfe_isr_read, .isr = vfe_isr, .pm_domain_off = vfe_pm_domain_off, diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-8.c b/drivers/media/platform/qcom/camss/camss-vfe-4-8.c index b897f5163c5d..19519234f727 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-4-8.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-4-8.c @@ -247,11 +247,13 @@ #define MSM_VFE_VFE1_UB_SIZE 1535 #define MSM_VFE_VFE1_UB_SIZE_RDI (MSM_VFE_VFE1_UB_SIZE / 3) -static void vfe_hw_version_read(struct vfe_device *vfe) +static u32 vfe_hw_version(struct vfe_device *vfe) { u32 hw_version = readl_relaxed(vfe->base + VFE_0_HW_VERSION); dev_dbg(vfe->camss->dev, "VFE HW Version = 0x%08x\n", hw_version); + + return hw_version; } static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits) @@ -1180,7 +1182,7 @@ static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe) const struct vfe_hw_ops vfe_ops_4_8 = { .global_reset = vfe_global_reset, - .hw_version_read = vfe_hw_version_read, + .hw_version = vfe_hw_version, .isr_read = vfe_isr_read, .isr = vfe_isr, .pm_domain_off = vfe_pm_domain_off, diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c index 9b4f8136759c..6b2f33fc9be2 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.c +++ b/drivers/media/platform/qcom/camss/camss-vfe.c @@ -1299,7 +1299,7 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, return -EINVAL; } vfe->ops->subdev_init(dev, vfe); - vfe->ops->hw_version_read(vfe); + vfe->ops->hw_version(vfe); /* Memory */ diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/platform/qcom/camss/camss-vfe.h index cca251816d28..f166d176cb77 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.h +++ b/drivers/media/platform/qcom/camss/camss-vfe.h @@ -103,7 +103,7 @@ struct vfe_device; struct vfe_hw_ops { void (*enable_irq_common)(struct vfe_device *vfe); void (*global_reset)(struct vfe_device *vfe); - void (*hw_version_read)(struct vfe_device *vfe); + u32 (*hw_version)(struct vfe_device *vfe); irqreturn_t (*isr)(int irq, void *dev); void (*isr_read)(struct vfe_device *vfe, u32 *value0, u32 *value1); void (*pm_domain_off)(struct vfe_device *vfe);