From patchwork Mon May 29 06:25:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 100112 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1319959vqr; Sun, 28 May 2023 23:51:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4CzHHFTdGk1rGIfINfh/QN9VHoeLYLRZRNXKiWCzFuevAPPx9SLx1oBuJ033Ot6J3qRMDD X-Received: by 2002:a05:6a20:72a8:b0:10c:3cf3:ef7e with SMTP id o40-20020a056a2072a800b0010c3cf3ef7emr8927519pzk.42.1685343061240; Sun, 28 May 2023 23:51:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685343061; cv=none; d=google.com; s=arc-20160816; b=DCptp+yDxjePULwJooGIuQRTI48DxcL7b9IDnBoujHHxJxCaiBMgqH16uIn1l4pQge eVwedJQ0AniJxMxI+Is/qcajgi0rRiDToQUhiriOHPwV9/fUSZZfBQxAGSHfc7lsQnz8 bRxr+DRufV61tIZVaChDy57keGP6WwfaURnLwcM8lM5uEdq9c8zqk9AIqu18y1ELyHC/ FpVGvgQNEUGU52tYCtYPXLkRyqekQY6wk2NDPlvS1shK7RuwTKs+t4Xv6BgeTCGkOBXL 4SgzX9Mikz3YYQAxC10qErAWvs+S4vuEDLFWiXAEi1MuvISUcLygGiFvQnUF6DmQoBLl v4cw== 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:cc:to:from; bh=I6wrXTLtk+T+M0+0vot1sHidxwRMTZ+UBL8LgnHHU1Y=; b=vMT4HZeLyDIk6W1cD+raBmwztmSPuM+w0HV75FpvrRUc8VycsdABDHi8sAUknHsLT1 QE+ZCjsrYToChI5Tg/dILRD4/+55z+1daRrj1L5kYSpeK/yjno84pVmuR+vhoM4faFr7 GFiz1rrnq+zBigTpZSv2vXkzopfvRQZKRl0LkPQ6hAb70WGmNmh9klkC4FtEWneGuaOr bpbqoOrQ++qmH8mFBkyEb6YqElLZgL7KRaLI6yWBT9zmpJrXOFR/mInezqwjaKORO6WV 2O2basrRN0XYdzni8a+VvrCeycBtOPIvPSS0kDSOpy9f++9T7+g/q7LNwH96G1qZ9fds QWEg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q38-20020a635c26000000b005348885119asi8540127pgb.523.2023.05.28.23.50.43; Sun, 28 May 2023 23:51:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231667AbjE2G1X (ORCPT + 99 others); Mon, 29 May 2023 02:27:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231556AbjE2G1O (ORCPT ); Mon, 29 May 2023 02:27:14 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 383B7DC; Sun, 28 May 2023 23:26:39 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BE93CC14; Sun, 28 May 2023 23:26:25 -0700 (PDT) Received: from a077893.blr.arm.com (a077893.blr.arm.com [10.162.40.17]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D0D0B3F6C4; Sun, 28 May 2023 23:25:33 -0700 (PDT) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org, suzuki.poulose@arm.com Cc: scclevenger@os.amperecomputing.com, Anshuman Khandual , Ganapatrao Kulkarni , Rob Herring , Frank Rowand , Russell King , Greg Kroah-Hartman , "Rafael J. Wysocki" , Len Brown , Sudeep Holla , Lorenzo Pieralisi , Mathieu Poirier , Mike Leach , Leo Yan , devicetree@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, James Clark Subject: [PATCH V5 2/6] coresight: etm4x: Drop iomem 'base' argument from etm4_probe() Date: Mon, 29 May 2023 11:55:07 +0530 Message-Id: <20230529062511.52016-3-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230529062511.52016-1-anshuman.khandual@arm.com> References: <20230529062511.52016-1-anshuman.khandual@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767210285545434879?= X-GMAIL-MSGID: =?utf-8?q?1767210285545434879?= 'struct etm4_drvdata' itself can carry the base address before etm4_probe() gets called. Just drop that redundant argument from etm4_probe(). Cc: Mathieu Poirier Cc: Suzuki K Poulose Cc: Mike Leach Cc: Leo Yan Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Reviewed-by: James Clark Signed-off-by: Anshuman Khandual --- drivers/hwtracing/coresight/coresight-etm4x-core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index 7e96293c638f..748d2ef53cb0 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -2044,7 +2044,7 @@ static int etm4_add_coresight_dev(struct etm4_init_arg *init_arg) return 0; } -static int etm4_probe(struct device *dev, void __iomem *base, u32 etm_pid) +static int etm4_probe(struct device *dev, u32 etm_pid) { struct etmv4_drvdata *drvdata = dev_get_drvdata(dev); struct csdev_access access = { 0 }; @@ -2065,8 +2065,6 @@ static int etm4_probe(struct device *dev, void __iomem *base, u32 etm_pid) return -ENOMEM; } - drvdata->base = base; - spin_lock_init(&drvdata->spinlock); drvdata->cpu = coresight_get_cpu(dev); @@ -2120,8 +2118,9 @@ static int etm4_probe_amba(struct amba_device *adev, const struct amba_id *id) if (!drvdata) return -ENOMEM; + drvdata->base = base; dev_set_drvdata(dev, drvdata); - ret = etm4_probe(dev, base, id->id); + ret = etm4_probe(dev, id->id); if (!ret) pm_runtime_put(&adev->dev); @@ -2137,6 +2136,7 @@ static int etm4_probe_platform_dev(struct platform_device *pdev) if (!drvdata) return -ENOMEM; + drvdata->base = NULL; dev_set_drvdata(&pdev->dev, drvdata); pm_runtime_get_noresume(&pdev->dev); pm_runtime_set_active(&pdev->dev); @@ -2147,7 +2147,7 @@ static int etm4_probe_platform_dev(struct platform_device *pdev) * HW by reading appropriate registers on the HW * and thus we could skip the PID. */ - ret = etm4_probe(&pdev->dev, NULL, 0); + ret = etm4_probe(&pdev->dev, 0); pm_runtime_put(&pdev->dev); return ret;