From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 760DCE63F08 for ; Sun, 15 Feb 2026 22:55:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=SDAWD+zXkHF7Q8/oCAKsBHT7FMcHCuAatg0ikwgt6m8=; b=pWjaAJfyrJLoIDAVlNq7NuvqZ/ JUmEeY1YXwtRll3BmRtDW+SB/G25SM7Tp405M6v54fvofgmN7DGcBpmjxrcdQF011lr3efm4bI0aE N0Y5xba35kFAsZBG0hQ3uD5IUGo2CPKr1CTB3gZkQJJcU2FxCS9fwz/jgbYggUNhTBZ7a88N4WqBd fg3dpw2ObED7YCELJqyBOmGLynAbufQDV9lRTWutJRZ9QMg9VKWpZfNgxG7nNhUBiu+W3r5bj6Phd PmAE20p6sC6P9ZbJIUmwm58bdMDYly+GFZUJaQw+ks+GXrKWCU7hsF50lWge5lJDV7kO+8aHBEH44 PJTaNVRA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vrl1V-00000005jOK-2AvA; Sun, 15 Feb 2026 22:55:29 +0000 Received: from zeus03.de ([194.117.254.33] helo=mail.zeus03.de) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vrl1Q-00000005jKC-2IiN for linux-arm-kernel@lists.infradead.org; Sun, 15 Feb 2026 22:55:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=SDAWD+zXkHF7Q8/oCAKsBHT7FMcHCuAatg0ikwgt6m8=; b=jiHHIM 0g2VazD677OIuKJnrkDs9QTq075LxIUEGl7auRt5XCEkbLh7pCGYGQkjCWO/cI2I /9x8BZJU1UCOEDZHM7hxHxvnSV/f0F/01uPhq2C0jY/RFuyNKPzaiyyBD7sht3BT 6k8jTfPQVozUmN+W8AWeLKBStxGcLF6muxeUi6cLELGQqeWJHjkmKwQK68evPqO0 ps3xTEXQ6cc7ETtsO3cIX0RGNWHkE/SbUrixKZQGLHaXoFDJnZcrnGV4im6235pc WuAiRpiUlTAiCGTSCOGuFDzxp7a2rHvwok3kh18fuHMg7q7rglZ6Xjr3AQuFEhux Eh/7AfYm4s9gJkyA== Received: (qmail 3011406 invoked from network); 15 Feb 2026 23:55:09 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 15 Feb 2026 23:55:09 +0100 X-UD-Smtp-Session: l3s3148p1@SF/juuRKeoQujns5 From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Andy Shevchenko , linux-arm-kernel@lists.infradead.org, Wolfram Sang , Bjorn Andersson , Baolin Wang , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org Subject: [RFC PATCH v2 04/13] hwspinlock: qcom: use new callback to initialize hwspinlock priv Date: Sun, 15 Feb 2026 23:54:44 +0100 Message-ID: <20260215225501.6365-5-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260215225501.6365-1-wsa+renesas@sang-engineering.com> References: <20260215225501.6365-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260215_145525_046145_14D6C44E X-CRM114-Status: GOOD ( 16.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Apply the new helper to avoid using internal structures from the core. Remove superfluous setting of drvdata while here. Signed-off-by: Wolfram Sang --- drivers/hwspinlock/qcom_hwspinlock.c | 45 ++++++++++++++++------------ 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/drivers/hwspinlock/qcom_hwspinlock.c b/drivers/hwspinlock/qcom_hwspinlock.c index 7ff89c3e8c6b..73b280988109 100644 --- a/drivers/hwspinlock/qcom_hwspinlock.c +++ b/drivers/hwspinlock/qcom_hwspinlock.c @@ -25,6 +25,13 @@ struct qcom_hwspinlock_of_data { const struct regmap_config *regmap_config; }; +struct qcom_hwspinlock_priv_init_data { + struct device *dev; + struct regmap *regmap; + u32 base; + u32 stride; +}; + static int qcom_hwspinlock_trylock(struct hwspinlock *lock) { struct regmap_field *field = hwspin_lock_get_priv(lock); @@ -89,10 +96,23 @@ static int qcom_hwspinlock_bust(struct hwspinlock *lock, unsigned int id) return 0; } +static void *qcom_hwspinlock_init_priv(int local_id, void *init_data) +{ + struct qcom_hwspinlock_priv_init_data *init = init_data; + struct reg_field field; + + field.reg = init->base + local_id * init->stride; + field.lsb = 0; + field.msb = 31; + + return devm_regmap_field_alloc(init->dev, init->regmap, field); +} + static const struct hwspinlock_ops qcom_hwspinlock_ops = { .trylock = qcom_hwspinlock_trylock, .unlock = qcom_hwspinlock_unlock, .bust = qcom_hwspinlock_bust, + .init_priv = qcom_hwspinlock_init_priv, }; static const struct regmap_config sfpb_mutex_config = { @@ -202,17 +222,14 @@ static struct regmap *qcom_hwspinlock_probe_mmio(struct platform_device *pdev, static int qcom_hwspinlock_probe(struct platform_device *pdev) { + struct qcom_hwspinlock_priv_init_data init; struct hwspinlock_device *bank; - struct reg_field field; struct regmap *regmap; size_t array_size; - u32 stride; - u32 base; - int i; - regmap = qcom_hwspinlock_probe_syscon(pdev, &base, &stride); + regmap = qcom_hwspinlock_probe_syscon(pdev, &init.base, &init.stride); if (IS_ERR(regmap) && PTR_ERR(regmap) == -ENODEV) - regmap = qcom_hwspinlock_probe_mmio(pdev, &base, &stride); + regmap = qcom_hwspinlock_probe_mmio(pdev, &init.base, &init.stride); if (IS_ERR(regmap)) return PTR_ERR(regmap); @@ -222,21 +239,11 @@ static int qcom_hwspinlock_probe(struct platform_device *pdev) if (!bank) return -ENOMEM; - platform_set_drvdata(pdev, bank); - - for (i = 0; i < QCOM_MUTEX_NUM_LOCKS; i++) { - field.reg = base + i * stride; - field.lsb = 0; - field.msb = 31; - - bank->lock[i].priv = devm_regmap_field_alloc(&pdev->dev, - regmap, field); - if (IS_ERR(bank->lock[i].priv)) - return PTR_ERR(bank->lock[i].priv); - } + init.dev = &pdev->dev; + init.regmap = regmap; return devm_hwspin_lock_register(&pdev->dev, bank, &qcom_hwspinlock_ops, - 0, QCOM_MUTEX_NUM_LOCKS); + 0, QCOM_MUTEX_NUM_LOCKS, &init); } static struct platform_driver qcom_hwspinlock_driver = { -- 2.51.0