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);