From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 60E062153EC; Thu, 12 Dec 2024 17:31:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734024675; cv=none; b=YiagEVeApk4oObyDdZbrlqDLlKrMjooufa2tyQX6h8geRk1nDVSqhLGYAntqUDcAS3+qeyHQpXJHtqhMGdLeU/ktBKeUgXQZQeA5ikBOtDPl5e1sTtXtX0MIbu8/VKEn7XjlPNfWzFDuWYpK7KibmUTThFVWUuInloDAh5WIfTQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734024675; c=relaxed/simple; bh=Wu+dEgErI5I/+UvWafkas6WmE6fZ3I3+BncZXwjRmVM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T13qrUQt/Qg4env1zbO5IC+Ht0uM+mc5LxBsBfUVnUn6ZCKu1Dmd7m5FLea2rVvIgC6Pq17VSMtsF5umAP30txXEBuwDaZjH/vJwmDLYST+SxylaMRphInFchHD/zRwMGldU3db/zCLq7mYhLH26H063sS59+9dkqypE7DaRWGI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fNGiqrTO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="fNGiqrTO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC27FC4CECE; Thu, 12 Dec 2024 17:31:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734024675; bh=Wu+dEgErI5I/+UvWafkas6WmE6fZ3I3+BncZXwjRmVM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fNGiqrTO8rG/sGis89Ld/6F82mX7ZKn1nAZE83HwcaM57eEsv5a25z7mxEwJ5dVje 7mAcqLRyjV3KDYLqK0lPqHrgmKSYtMtjJFSuo81rx1Si0geNYzKVGpfIDnqXf04wKV TrAna7yMzMdn/AlCfC/2Y9vDQPNGQaZbCv6q5CU8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Cosmin Tanislav , Mark Brown Subject: [PATCH 5.10 374/459] regmap: detach regmap from dev on regmap_exit Date: Thu, 12 Dec 2024 16:01:52 +0100 Message-ID: <20241212144308.443624627@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144253.511169641@linuxfoundation.org> References: <20241212144253.511169641@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Cosmin Tanislav commit 3061e170381af96d1e66799d34264e6414d428a7 upstream. At the end of __regmap_init(), if dev is not NULL, regmap_attach_dev() is called, which adds a devres reference to the regmap, to be able to retrieve a dev's regmap by name using dev_get_regmap(). When calling regmap_exit, the opposite does not happen, and the reference is kept until the dev is detached. Add a regmap_detach_dev() function and call it in regmap_exit() to make sure that the devres reference is not kept. Cc: stable@vger.kernel.org Fixes: 72b39f6f2b5a ("regmap: Implement dev_get_regmap()") Signed-off-by: Cosmin Tanislav Rule: add Link: https://lore.kernel.org/stable/20241128130554.362486-1-demonsingur%40gmail.com Link: https://patch.msgid.link/20241128131625.363835-1-demonsingur@gmail.com Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/base/regmap/regmap.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -636,6 +636,17 @@ int regmap_attach_dev(struct device *dev } EXPORT_SYMBOL_GPL(regmap_attach_dev); +static int dev_get_regmap_match(struct device *dev, void *res, void *data); + +static int regmap_detach_dev(struct device *dev, struct regmap *map) +{ + if (!dev) + return 0; + + return devres_release(dev, dev_get_regmap_release, + dev_get_regmap_match, (void *)map->name); +} + static enum regmap_endian regmap_get_reg_endian(const struct regmap_bus *bus, const struct regmap_config *config) { @@ -1493,6 +1504,7 @@ void regmap_exit(struct regmap *map) { struct regmap_async *async; + regmap_detach_dev(map->dev, map); regcache_exit(map); regmap_debugfs_exit(map); regmap_range_exit(map);