From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 BAA6F361641 for ; Mon, 23 Feb 2026 10:58:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771844283; cv=none; b=Fif5JIZpG4kw0LVoHZQJbid7IodF/ZLvFjNsQ6X+QshYG+vg6V5uKIucqcE1vE64O6h2lmQvdd3x2SvFU7acfL6NXIvNwcSerIy/dz3iIuDNERj+Mc3ppEgh8pVpT4nfncBZqO1EnxP3KMPaYE6d51egcD5gPJ6MxJWGBVeZmLw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771844283; c=relaxed/simple; bh=O6KnheLxNXNr7Yefw3yOtHx8EuLujSVOw4DHMD6meBs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nJOo2UOeGdNtrsKqujrnwDJqIaRA+MuKQFsLMlSC/npbvuEitjU+O9Rg8lXyZNmJkkyDfN5I3Mxtt9ostlrNodKQFqrjE7bZKIALW3ROhDk2wATgHrmt8Sze1rMvan6pbOLj6e80dmof/+psPG6KqaInWc7LkwXNZqc0g44CSDg= 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=E1pY/f9r; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=EH5ImODr; arc=none smtp.client-ip=205.220.168.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="E1pY/f9r"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="EH5ImODr" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 61N9i89j1754162 for ; Mon, 23 Feb 2026 10:58:00 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= xzvA+Cqq6/Dp64nx2BQf92SFvmvzz8gdWnA5C8+/n0Y=; b=E1pY/f9rUAO1oMXx GP7BzDoFvPrJ6vADdiqmkVHYtfuwOkZ2JAIP3kNCIO0OYUu18qp0D2lfCuBkWoy1 rVJQXIvtIt5zEOvZlN9qyPePOaZOqvPzRX2t7iJswDfthC/AA5Vmv4WwR/FlamdV 9xPxp9RM+nLzup47A7ZD4EnqWnCftbjn4i4kgNPmGBB/d/hzCZIqchrpV55CvsjE V/lpUeAiqm9vUwbqaAN9WdbB1rEc/zfLL3rCKeun7wNdowjBFs+v5Q9po/w27IJG XHCHFPhsuIh17XVTWzwXamU+xWsZvLNiDvUCsiAc/c2hMkmZ3NIKaaK9EftHbFBe JW75dg== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cf5wavfb7-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 23 Feb 2026 10:58:00 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8c70d16d5a9so3736204485a.3 for ; Mon, 23 Feb 2026 02:57:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1771844279; x=1772449079; 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=xzvA+Cqq6/Dp64nx2BQf92SFvmvzz8gdWnA5C8+/n0Y=; b=EH5ImODrOXz6Lch5wTvrXyIFFlSQQveGmvrAMTPWpERzkjwd/V2e99G2urAyjy0PXO PICyNqX0kgDuQ4NyTS9q0hhOJLTHXvE/ZCNg6C0dzn6K89UCh0qAFT5IvYg2XOKeNmyn ExDFVJvEHJxTBPGvRejPbkAPorieahbDLeNHTA57MBH4wLQusdjWn4c9S4G6uRpZA1N+ ghx4Z0SuzOOO16t5x3gBX+qXv04m3736pjpwZIemF2e7fRn5mo0FqW+0jl30XacJb3+r 5tYknwmOM33MYPN8sA9MYJJMug2xwE27RGThN67AW/lkhjM5qbEmC/rfGtHEmpp/k03j bmWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771844279; x=1772449079; 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=xzvA+Cqq6/Dp64nx2BQf92SFvmvzz8gdWnA5C8+/n0Y=; b=lZjz3IscKNcPSIsotv6Tuh+FTrh5abFqwPJ2iEeMF0aNWc04bl5TE3Fwb3uxzqUe3v Q4SL8h1EmMd79jeC4evmULnQhx+tT5MglpUvP03lwsC3X0eNKVhXmLgPUrZKNNyW809J AhrzduQWn6xq6860T8PNQd5EM4zyaAgculuML5kla2oVIgwIFtm692lZeZYF+lrZL/FC qdfAPX8cJMJy7tFuxQsWW+nk5D2zQ0vo0GyM+zknIx+XFPXwiyJkyI+sqWaz5h20F/Wg LGwvjJXXEH8FGB3Z0c8gsFYCAj5153iW9P5vJnf1AjF18GyMnnu8lE8wtrJdQi9C1/L+ ChsQ== X-Gm-Message-State: AOJu0Yx0gGXS5EQQMPE44NFzDbOp9EkWHFOSk6zCJqlt4Prt8asouBI9 7ci4+d0qkg2kex386izQvvh519Ug7aqkHUpWo4gP2SoCFmWEagftcB9mRHKabz3M5CuKZdKfcfQ lx5XzdOH8hNoWyuHF1kNbpUfuqBmjdCiovoqy0W29tYZlEEBUkGq8/97RIQxn4mzst4I= X-Gm-Gg: AZuq6aJVQMRkZ6Cuiz4NmMwRvi96bc0eSxhFGtCXZjHvo+yEWWSDPlIordAAWgdzgcH 3J8y6naH7K+mT7oks8HGm9wgECD4DJaxUibZgzgMkA8s1WJdRsCRdKRzSKbDsxRVkPFvV+dB50n y1ERvq2UTwZyrEwDoDdwIVXXl3F/Fvb1bew95U6zIBnrLXVR6/ugChav1kift0R9Ea1uyCTgCix F1rZK3VHC6P3GqH5a8wLzkHKsdT+IKoG09TmHOv84OOjs9eudaCkBA0DRXWiAwqFcWH68BW/yAw x+yJVU/8GyJJWwidyeFcNMY9H19WX37f9MU0eTle2vHZbdV9mIKnIYhCL+9Yj/0zbYXLkiBb1QC a5jrx1qyOf7yMwca2+evFnkWrirtU7acZEpWEf6agUukPdO0Ouadh X-Received: by 2002:a05:620a:f07:b0:8ca:1240:4991 with SMTP id af79cd13be357-8cb8ca7223dmr938268685a.45.1771844279213; Mon, 23 Feb 2026 02:57:59 -0800 (PST) X-Received: by 2002:a05:620a:f07:b0:8ca:1240:4991 with SMTP id af79cd13be357-8cb8ca7223dmr938267585a.45.1771844278709; Mon, 23 Feb 2026 02:57:58 -0800 (PST) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:bd71:422c:5e83:8b37]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43970c00c18sm18120002f8f.14.2026.02.23.02.57.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 02:57:58 -0800 (PST) From: Bartosz Golaszewski Date: Mon, 23 Feb 2026 11:57:06 +0100 Subject: [PATCH v2 5/7] 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: <20260223-nvmem-unbind-v2-5-0df33a933dca@oss.qualcomm.com> References: <20260223-nvmem-unbind-v2-0-0df33a933dca@oss.qualcomm.com> In-Reply-To: <20260223-nvmem-unbind-v2-0-0df33a933dca@oss.qualcomm.com> To: Srinivas Kandagatla , Bartosz Golaszewski 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=2822; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=O6KnheLxNXNr7Yefw3yOtHx8EuLujSVOw4DHMD6meBs=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBpnDKsnuZvMCflu23/5edHIPKJO6lVsUlbiGNuA D53rxNX2dSJAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCaZwyrAAKCRAFnS7L/zaE w3jCEACBURTczxA32fBRVaMpwUY1GnMtuNBgc5ROo+wqDsO9CnnfAtsET81uMx/8hAdSckv4uNM Zyua8EVq/JdRW8LSlui5vUTEHQNi/A7HFx0S8GZDgFuqjaQ9i8655+CXW83fYrV/3FV/VaxQDdU Wu3LBmD44NJcVkCthDKR9YeL46g0bFQyuQBypS6YPlyEP86mBVpg6NfjHNm2doXIHKaVOzWCLUn jZz1qM+TcL74LpFyZMSIMYK7yT5wMfVDWWjwOdCA0Hmhg8YtIzmxLlzVS60A6U1mMQqCQAVO4OV syirVP9niYHAO7Tj+nCEiTNzYK76MP9YqQddfxPaz9HmlcoAXd2GEMeZU0/YcNn1VVV8PdZNElu 10I58osG3zK2cGclUwhy27fEwJABdgLQAeShGJWqv7pMu3FSZN7v7TD0X5+pLuTfywwroN2Pk4M 7Yng7k/m0VoCVPvinlYobdP9/g7iyJ99TjHPDqcm59U6VrmDiiV4DHEzSQhjKhPD7GhTiD/dO9d 20f6dUidHRkwh/k6+34JQGxOEowkqo0YTzWY+msIzp75u13Sn9hXH7qE3sPfO+s6H2B4oscXASB wXyCd6irY0V1pdJcD5uENnWrrxrUgVuJ7ADUVdJnhm9J6j673g8Ir8mXlG15OBlaSlgI2Y5MZLC NX42t2kObf8es4Q== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Authority-Analysis: v=2.4 cv=KJVXzVFo c=1 sm=1 tr=0 ts=699c32b8 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=ePmvc8VEzdrDOxTP0soA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjIzMDA5NCBTYWx0ZWRfX14LkS1KQVKNS 9O7OJPVbl18GJ1SWMBz2tO2V1Sl+nmOgMARhBvaABZnAO1t9Di+cf5ZYoKaCLU817iXZXklrdt3 HqoFIhMbJWCZOC7w2J2ZMBoa5DzveoQIMuahnKZhQYX2OZ1iBHxR2qKUd54d+04iXWvLymVmT8M tb9g7w9ESa8gphbZN8CEISas92mOkk7B4m8ELKyXhMI9C7uJUlwSXH5oQqEpA3BbPWTZd23oxeS leOyUNURKoPY8KIH2nLZhQKrsl6FMSwfR0ksFtoSLqsMkUlmJCOFtUHnRFkO4qVm01dWQU3NIw3 grihwR8KOwPRE4QJTyEvvSbKuehzdfiLyEHSfy7HY6+aID/f3laVxkleBOviL/L/zzpAmfL1f3t QkZ9sbd1s7q9A4J2pLmNo916zMXFJWGAVGLyzQeSQ4rQGRO8uITFhcHD06TsCQ01MWOidEDKEyU Z6bEYZNZ3OHqgeEk5Ig== X-Proofpoint-ORIG-GUID: tKHIc7vUuIJUhuM_7nN6rTazFJ7woFS6 X-Proofpoint-GUID: tKHIc7vUuIJUhuM_7nN6rTazFJ7woFS6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-02-23_02,2026-02-20_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 bulkscore=0 lowpriorityscore=0 priorityscore=1501 clxscore=1015 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2602230094 __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. Signed-off-by: Bartosz Golaszewski --- drivers/nvmem/core.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 42827ba2146ce9ba07716ac5973327da6e9426da..30aee8089f1dc65b1fa07dac8fb35e1dbbcd0ce7 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -1134,13 +1134,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 @@ -1253,7 +1246,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); @@ -1341,12 +1336,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; } @@ -1456,14 +1451,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); @@ -1473,7 +1468,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); } @@ -1588,7 +1583,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