From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (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 83D13371CE3 for ; Wed, 29 Apr 2026 15:43:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777477431; cv=none; b=cez0QAjroaEa2h/2M7nLcVGH7I50M+5xxg8+txU5NVvDCixmVqTYOy0sWtVv1dLQmA8ftjqcgfMvreEKXM1OpK99vH4/vVyj+gWTmfdR2Y7vRGMLekT+W2M/yHokrJwoFnWBI5AUAILYK0LPZhE5UMSq86TH0/opWhLgAiIsLhI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777477431; c=relaxed/simple; bh=6uzO5c/vnXQq7ok9oylOcCu9yXiAc5gVszkHwsCu24I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oHsNcp8uN6JCOpKjL++b91Mlc2E09TNNlHztACp5i7ERT4Qp/wUjohn/pxnD4imCUOfkaDtkKxXmqO1jYrfsnf6nRJiYe152z2Uz/YiKLlaFRV4rWUSCRBjltw9wye+SBjrrgu8CoOUt0aKxdKT1tiJyuPiTUVmwyF3bUI2ng94= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=AYupMHC7; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=HXy8o7r8; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="AYupMHC7"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="HXy8o7r8" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63TFILl41728584 for ; Wed, 29 Apr 2026 15:43:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 8qHyF02mW7FGGLG/ddkk/kF/a5cWORIIRnYeEp05p9A=; b=AYupMHC7AHK8Hzqt cVjKvZVdKta/x8aVWvMXbi3G3rlh1/gGG5S2J7mRUZMwi3wjTLDUEQtGyvDEmhjI +e2Tc3gaNKqsdrVSVR/n4tuKh7S+PrBKo/oYWdzgd8R40opfS5q+rpfaBWS5dUI7 N23e54jKCpRkC5AtPIsa3qaCSR1/w3x516mC5rwkutpB1HfnJVEMkFKhlMpmT28e wRaOi9L6WLWnC729YvnRssaDdAXlCg5v79dDpQZw/I4h6tBWqoLu0c2cHEFaP0BU iyNBYVVZPO4exi07h6f4iecCirLD+CP+dhbS6mNqd6Q4BCuzpyLM75GM/SLtDiQp s6X03A== Received: from mail-ua1-f72.google.com (mail-ua1-f72.google.com [209.85.222.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4due5ksr3b-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 29 Apr 2026 15:43:47 +0000 (GMT) Received: by mail-ua1-f72.google.com with SMTP id a1e0cc1a2514c-9568c49aa10so7493418241.1 for ; Wed, 29 Apr 2026 08:43:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1777477426; x=1778082226; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=8qHyF02mW7FGGLG/ddkk/kF/a5cWORIIRnYeEp05p9A=; b=HXy8o7r8SX+MlEjuYLZBao943AB2jIIX4w4W8ZztGekMaqne8ud7AigXuSBEWoG06F St3vQv0ufaSO6zFePBNmhu9ZOGQRrBRQPMN9Aod9g4bG0pMtVVYy7f95EToGbpo9XrF8 0UVR4IyiIGheDRObzyQsAEJS/1YW164kKLNHhc5svNv3UrVCyUAL600E60re3FHT18+9 if72CEQyE29wHriQhba4EuwD+Kg3gjKd4rijHcqyjjpUeGcyMI9tfFwwXERhYYslGRgF 1Cc/Zj8zGsR4PZWhRcmZTktEcbbb1zmga6+ItT1Am6vOQBo7XkZIa/sIBczshB5P557Z QIgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777477426; x=1778082226; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=8qHyF02mW7FGGLG/ddkk/kF/a5cWORIIRnYeEp05p9A=; b=l+Zy3Sl+yQLtzr0iEtSLYIdNK5gEY+oeiyzJOenP7DdT9VkjuudoSdlDHX/SEBBPkK gq8ZwMQXFkQZ1ty0AHhjS7EnbU+7rVbnEtqzeYiMaS3eDhTeom7CcGxOg+MWNgA3z7p8 Cb7da2JI6plt6tMAD0NwLDevh/yfUuu4exxiPGKTnGbKfdiXu6h3ruh4MsjyDPlKImeO csldIMdqpqrc29VgwwvABSzVw/Y0hZ552XUQNb07WNphhTivRUInU+BEOXpsIpWmedEL J8gEtIvjRw1hGMWIAjahm/3v/td1C4djFSz8BP7vBWBjtqVqiX1klr7/5l76asRLM0dy JOwA== X-Gm-Message-State: AOJu0YxEBiMcw4sr3HA64Wmlo+fs7HZznPC/22vmAi19HRf51wn4fHzs 3yLv13nD0GHr+4oBaQEjjZDK5ITHoLGDOKe2MRWhpV1LrH7F7CM5LWlhCAX6KaJOOO8d96qOgPR dSKdz/IY1Z3qg+klSDfGaeG9eWV4Ajn2xajsjZH/4HheleNAHgYpaNjqKFDuZrk2JkjQ= X-Gm-Gg: AeBDievIxeqIXOQoz4ASp13DyoMnnMTyK2ouceZ1m8xl4hOoyC+upt2uKbWJLXOvvLY OXUaaK/3Vb9tjpsg4DwT7TXFKiSe6Iy3axm+Y7aCX3HINkbCebMnnyRuAs3hzIWwyj3D8c69Enn +Fv07VezYT2JJx4JvaVQFW58oIfoPc+gxe0ZvJxei5ZaucVtU/d67Q//Ja6lbenwjij/ScH0Nfj ylKCnADM2WLu1bMsL1my1g9yyjneYkFy9+tK4mr1lNV4JSDtza7GW2YIKjJjLA+ZwjNVk2OhH9p XebjK2bhFvOTyJWySPRCwNQPHr5UsiDYkZVm0JrW/yvp2SJ81H57tN+/AIMRr1ALA3u0efVa7ao PccqsBx02DDd16RhUL8ZCfGQgKOrxHN1lirGI2RVn0Z+hUoQ7aIxq6/kMxv+o5Q== X-Received: by 2002:a05:6102:3909:b0:618:284b:c95c with SMTP id ada2fe7eead31-6280a4b2846mr4143777137.14.1777477426542; Wed, 29 Apr 2026 08:43:46 -0700 (PDT) X-Received: by 2002:a05:6102:3909:b0:618:284b:c95c with SMTP id ada2fe7eead31-6280a4b2846mr4143725137.14.1777477426055; Wed, 29 Apr 2026 08:43:46 -0700 (PDT) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:e9c0:e45a:1dbc:c82a]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-447b3d481b2sm6837552f8f.4.2026.04.29.08.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2026 08:43:45 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 29 Apr 2026 17:43:20 +0200 Subject: [PATCH v3 5/9] nvmem: remove unneeded __nvmem_device_put() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260429-nvmem-unbind-v3-5-2a694f95395b@oss.qualcomm.com> References: <20260429-nvmem-unbind-v3-0-2a694f95395b@oss.qualcomm.com> In-Reply-To: <20260429-nvmem-unbind-v3-0-2a694f95395b@oss.qualcomm.com> To: Srinivas Kandagatla , Bartosz Golaszewski , Johan Hovold Cc: linux-kernel@vger.kernel.org, brgl@kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5144; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=6uzO5c/vnXQq7ok9oylOcCu9yXiAc5gVszkHwsCu24I=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBp8iclFUnDPyWlWuJ1jfqgKlwU93E2RK8aMMrtP BvM7P4wUEKJAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCafInJQAKCRAFnS7L/zaE w48HEACXe64y8SAUmQlHb4hiLcEwqhASklg2Iz8GJpCux49fgGb2dG88PGkkovanWjYGK1z/u2i tPhoKLR1RJsDtHIFhvq+F5RjyzlRBTsIS9IFXf4Z2fd1ItIBKMyrpTMkpSRmCpE7kMitypgKIg7 g3BtAHDRV2vknr3So8mlYupZtnmfgWBNJtjYQimVkROlr5XPG1tvH0OvinreJQlBqI4UiySyPkE nhUtdqdCSy0v19/o5d9MaoIdMAmGKIJBdhJBlKvFSKn6VJduvK9vdTcpQ7mRRcCdpAoWL7+gydz 9nXKlkXFzdVPwnwUryzsdOQTEmcOxy3X6MVp/s+C8W6tfxPTl6qptPsnfNRoVDU/CWqJin3m0uY 9ZFbvPhHrFHPGNWBaTQISLS86AI3WJtEtM3I/g5Bt1gDd6oVzdAoECq6OB8EdJl7x59lC/g9qYL hWnCaIZAHR71iW029/kuj0GYQhD5XZmucPV+4UJ/Ra1SYFFlQL9yO6NcNA20zayDOmJCRt+Vmsx 7Hc7x+JhMmxtoNdRBxlDxYJqtOanqrDwjYttTJGIYmFJ4EkMYGxuMYVZN/Ydn4rsp4qTEDmXDR0 gF7fv/TrvDIfLddUwfxyFOhS0buuYHZL8Ux0TU4R7Dc091J0WK4DrfG5exj1OeFBrYFPPaUhRXH Nrov4X4PskLAJ7Q== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDI5MDE1NyBTYWx0ZWRfXzAIf9qzcQoeN Kjf0txNYbns5i5e6uGPp5gD2wXuTfIrgNW4YlJPWvWifNXpqZMIzS7ATi+SVgsuVJiDc77uldcQ ITEQfWKgjHDBs0Zr4LXNU69kZJbGZNK55kY4U0B9c13oh/8Le2Nx1mKnoTOvLoQmdVlWiU06nW2 Gop7zbUgXTdVrhXyBN/HRG5TETrv7rj744hnGike+f+XV+9UxSkwGf+euSN9maIRrPEdX9g/T30 NdA/YALK34GiLXte8/++1WNFURthi0EldvbA8TRQD+HN9lkGDQb9Xi+RG6ow+Sh4itcHOlVWC8x jnXjc9a4gNlu9RhLeXks0KrNYTSUwKg8u3bUEKa6iSHb1Gn9McVNtIvWynp8AaE0zGcN3AJw1ru p40hjNnpb78fc1ChfoktP1OYCC7uiHOt5fv6iuxb2nxsKh0RX7UN3tj9QMO6J5DywIcHftrEA2t Ds43WWf9/cto/fEdEzQ== X-Proofpoint-GUID: HfWi9oLicUuUeO-t3U6_q1J7T0lvfZz_ X-Proofpoint-ORIG-GUID: HfWi9oLicUuUeO-t3U6_q1J7T0lvfZz_ X-Authority-Analysis: v=2.4 cv=CL4amxrD c=1 sm=1 tr=0 ts=69f22733 cx=c_pps a=ULNsgckmlI/WJG3HAyAuOQ==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=SMy0nb2-HfDU0vXix7YA:9 a=QEXdDO2ut3YA:10 a=1WsBpfsz9X-RYQiigVTh:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-29_01,2026-04-28_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 adultscore=0 suspectscore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 clxscore=1015 malwarescore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604290157 __nvmem_device_put() is wrapped by nvmem_device_put() but there's no extra functionality offered by the latter so just fold one into the other. There's still the corresponding __nvmem_device_get() so in order to keep things symmetrical: rename it to nvmem_device_match() to better reflect its functionality and not confuse users by its presence in the absence of the similarly prefixed put() counterpart. Signed-off-by: Bartosz Golaszewski --- drivers/nvmem/core.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index d6c62b3a527d3412a990ca143bee3209ff28d18d..bca2cce793451bb46ede9e672dec6ec20f369fd8 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -1100,7 +1100,7 @@ struct nvmem_device *devm_nvmem_register(struct device *dev, } EXPORT_SYMBOL_GPL(devm_nvmem_register); -static struct nvmem_device *__nvmem_device_get(void *data, +static struct nvmem_device *nvmem_device_match(void *data, int (*match)(struct device *dev, const void *data)) { struct nvmem_device *nvmem = NULL; @@ -1128,13 +1128,6 @@ static struct nvmem_device *__nvmem_device_get(void *data, return nvmem; } -static void __nvmem_device_put(struct nvmem_device *nvmem) -{ - put_device(&nvmem->dev); - module_put(nvmem->owner); - kref_put(&nvmem->refcnt, nvmem_device_release); -} - #if IS_ENABLED(CONFIG_OF) /** * of_nvmem_device_get() - Get nvmem device from a given id @@ -1159,7 +1152,7 @@ struct nvmem_device *of_nvmem_device_get(struct device_node *np, const char *id) if (!nvmem_np) return ERR_PTR(-ENOENT); - nvmem = __nvmem_device_get(nvmem_np, device_match_of_node); + nvmem = nvmem_device_match(nvmem_np, device_match_of_node); of_node_put(nvmem_np); return nvmem; } @@ -1187,7 +1180,7 @@ struct nvmem_device *nvmem_device_get(struct device *dev, const char *dev_name) } - return __nvmem_device_get((void *)dev_name, device_match_name); + return nvmem_device_match((void *)dev_name, device_match_name); } EXPORT_SYMBOL_GPL(nvmem_device_get); @@ -1203,7 +1196,7 @@ EXPORT_SYMBOL_GPL(nvmem_device_get); struct nvmem_device *nvmem_device_find(void *data, int (*match)(struct device *dev, const void *data)) { - return __nvmem_device_get(data, match); + return nvmem_device_match(data, match); } EXPORT_SYMBOL_GPL(nvmem_device_find); @@ -1247,7 +1240,9 @@ EXPORT_SYMBOL_GPL(devm_nvmem_device_put); */ void nvmem_device_put(struct nvmem_device *nvmem) { - __nvmem_device_put(nvmem); + put_device(&nvmem->dev); + module_put(nvmem->owner); + kref_put(&nvmem->refcnt, nvmem_device_release); } EXPORT_SYMBOL_GPL(nvmem_device_put); @@ -1326,7 +1321,7 @@ nvmem_cell_get_from_lookup(struct device *dev, const char *con_id) if ((strcmp(lookup->dev_id, dev_id) == 0) && (strcmp(lookup->con_id, con_id) == 0)) { /* This is the right entry. */ - nvmem = __nvmem_device_get((void *)lookup->nvmem_name, + nvmem = nvmem_device_match((void *)lookup->nvmem_name, device_match_name); if (IS_ERR(nvmem)) /* Provider may not be registered yet. */ @@ -1335,12 +1330,12 @@ nvmem_cell_get_from_lookup(struct device *dev, const char *con_id) cell_entry = nvmem_find_cell_entry_by_name(nvmem, lookup->cell_name); if (!cell_entry) { - __nvmem_device_put(nvmem); + nvmem_device_put(nvmem); cell = ERR_PTR(-ENOENT); } else { cell = nvmem_create_cell(cell_entry, con_id, 0); if (IS_ERR(cell)) - __nvmem_device_put(nvmem); + nvmem_device_put(nvmem); } break; } @@ -1438,7 +1433,7 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np, const char *id) } } - nvmem = __nvmem_device_get(nvmem_np, device_match_of_node); + nvmem = nvmem_device_match(nvmem_np, device_match_of_node); of_node_put(nvmem_np); if (IS_ERR(nvmem)) { of_node_put(cell_np); @@ -1448,14 +1443,14 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np, const char *id) ret = nvmem_layout_module_get_optional(nvmem); if (ret) { of_node_put(cell_np); - __nvmem_device_put(nvmem); + nvmem_device_put(nvmem); return ERR_PTR(ret); } cell_entry = nvmem_find_cell_entry_by_node(nvmem, cell_np); of_node_put(cell_np); if (!cell_entry) { - __nvmem_device_put(nvmem); + nvmem_device_put(nvmem); nvmem_layout_module_put(nvmem); if (nvmem->layout) return ERR_PTR(-EPROBE_DEFER); @@ -1465,7 +1460,7 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np, const char *id) cell = nvmem_create_cell(cell_entry, id, cell_index); if (IS_ERR(cell)) { - __nvmem_device_put(nvmem); + nvmem_device_put(nvmem); nvmem_layout_module_put(nvmem); } @@ -1580,7 +1575,7 @@ void nvmem_cell_put(struct nvmem_cell *cell) kfree_const(cell->id); kfree(cell); - __nvmem_device_put(nvmem); + nvmem_device_put(nvmem); nvmem_layout_module_put(nvmem); } EXPORT_SYMBOL_GPL(nvmem_cell_put); -- 2.47.3