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 BC638361650 for ; Mon, 23 Feb 2026 10:06:45 +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=1771841207; cv=none; b=HddMBtqxsz0ivAwJXmN7rYlcfgw0HxtIuxnVRXq3dTryUct1Yokg2JcDDY5DR6k3RNYwDQZEhI9DQhDXEMz8DvbQtTmwiqdIxD1psC1GF7vQjdmvpd5dOr4hQ1WWMMm05mDCNW+Tqk9r9nlId0IRFEVrBrmccCasl7rge1UZ9A8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771841207; c=relaxed/simple; bh=/jjMTVDR3mYie9Ncx8hCNOw7mqA4MQBimid9vXcyuh8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uZOqFzCp6kOrM0onjkifcFPM9NaND6jpaGL8xVlAkYv+zU0i31T/+pBG6Lups6sjF/BeT3Pe3+nmvdZQW89NcTnfiGDq+QhEHCvvehT6MSIJGuEDd1MAos0LQ0afUE4kxdRX0LwsQGTDFxeSzKiG65LJ2DoDe7dABSqhTL0Stdo= 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=N6gvq0ew; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=DTPOCGQO; 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="N6gvq0ew"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="DTPOCGQO" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 61NA0PLR3003192 for ; Mon, 23 Feb 2026 10:06:44 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= pF0yH52MXQzce/UyYuQvs5aAI01bJoZ8xpfaV+SRcyQ=; b=N6gvq0ewRPcKsPi5 nCoepHa5hS6yPpe5ibMMOrody+aK+1TBc4l1AzXgmWllEX1XVlZrH2UPI3HcEA2W EWti5x0cs0ytvwFWVRZKMBlUb+Y1as0nrQDEDRmYfiH2nt2ajkLv/Tj91qUDTXtQ sygt8Jnv263KevQ4p6hQh55PKc8/ypTx3S+MS03iAc4IZAz59b5kV6bfffCBim6a f4J/Tm0plsL+a95AVIaL3TEn9+w0rCJhwvpQDAKcKo3nCbdpA0fo8Oio9FFYv5rD BWTl4MvV9GT4oPkdzvLnv1c+r59Mwf/IkTWPVeg1XLwc5Jb5MCuO3AUaeCrq5D+y 4J+z4A== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cf5vj47ng-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 23 Feb 2026 10:06:44 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8c882774f0dso3961770985a.2 for ; Mon, 23 Feb 2026 02:06:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1771841204; x=1772446004; 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=pF0yH52MXQzce/UyYuQvs5aAI01bJoZ8xpfaV+SRcyQ=; b=DTPOCGQOTqAd3DcWAptEeI6aUK3VGtaSyfsCcs0mbmkV3Vydv6jHz3L5IDkkCfA6la Phc1495N0KX8Tknk6uPSND2Q8vdQamRZPC1SPNLwIW8RNl7sRAvoeg9sz3eH7eUBQiUP 7TaBB8Qu5OsQDII6JyH7E2WJaYf/z/FKyW49jMu15+cT9hojtXhE2gfsF3nt+ebAo5fO gKr3rLvSlYJYGh5eFtEd/G/K5BVtouMI0VyOYrncQ0CEmnbcjCNJGw9G+vIirObYP32j 97Y6eJ2aZAoHTuo3g0DLB/HSE0s4vuW0g70Wbb4FAWk3lWuKWj2M2wqBVPYnjkbp2Ths 4psw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771841204; x=1772446004; 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=pF0yH52MXQzce/UyYuQvs5aAI01bJoZ8xpfaV+SRcyQ=; b=RKWdVjGJZ1nbwSKwuE/QZLy64i04KdWOfxWeSl95IfCRxdwDgSS/+Am1tZSRUYre07 ucm1oHU4DpIyI2NOYY5zeP8pQELyi0kD0vcygUZbDZMLpM8gesG2KXYgICC/sV8rx6FO Hmt5zjoUjxd8mMsMaFHjMdON5+gSLk53K6T/onvukxiploMFna27WTUnWm4egCBMKOse NeYgjHuGeiWcNzt7FgCig5e9WCqRaqlgLVL/6g53/IIFd6BYKmbnotE4fOOnh4/ehMI/ T2p2RmWoiDoh9chaM1JVtmH2+Y1GXqL6UPLP+zff/LoCEinelaoWtN772BbCyQpZS/NM xuXQ== X-Gm-Message-State: AOJu0YxRRaAkHu3b9WXRHD3q5nPp4WfsZOxeKXiv7E328PRSSgEuAWAR nZEaYBRPc0kQasxM1fHXadvAqC3XFd8v+Szc37Cu79QEuwg5rs3Ph5v838HpiSmVBFqlg4YW6TW jyaiu3WghdsNEHWOKO+MT8QKxznPeuWwIg3MqNzBoi3ZnuD/p9c0LGuo6oiOWX6Egm3w= X-Gm-Gg: AZuq6aJJhSU/uYkd+8N9OoFPXaPLSyDrSoaFUwAZFD3yBVV2irdiL6pcpQ1mg66aRKQ WA641BwdR5YZ6FlDR4TYJkTyxfqPGFRzJajYUVPrMdJnzKmXp7g7ieeZ/1WO3Amy3dO6rJ/OfiC r+Hpgmu0QVLpo76coa9DAoXx0nODE0BuenRrMKZAK/LCp10WCYtkISDS18AcIt5+WCj1ZHrKSjd /CtXzxL0D3haADvvAeDpsnmX7/4hcI+I8Ymexr4wSEi5hjJEpoJPP++4EqxzAKPNDEktSV3/5bH 3zF8PaLSQe4K/H0mBx4gyjTLDLwE2LtRwWEYPzL3H4/IB+Wuqr36PTSl2qY/d95LNooiOxe2LP4 f00tBuj1k5hiJqvSsf8SvD/Dk6dqxddaaDGiXy8KZ6L6mrs5y8AYu X-Received: by 2002:a05:620a:191d:b0:8b2:e827:14bc with SMTP id af79cd13be357-8cb8ca809e2mr805304485a.56.1771841203903; Mon, 23 Feb 2026 02:06:43 -0800 (PST) X-Received: by 2002:a05:620a:191d:b0:8b2:e827:14bc with SMTP id af79cd13be357-8cb8ca809e2mr805302185a.56.1771841203451; Mon, 23 Feb 2026 02:06:43 -0800 (PST) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:bd71:422c:5e83:8b37]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43970d54760sm18288885f8f.35.2026.02.23.02.06.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 02:06:42 -0800 (PST) From: Bartosz Golaszewski Date: Mon, 23 Feb 2026 11:06:19 +0100 Subject: [PATCH v2 06/14] reset: fold ida_alloc() into reset_create_gpio_aux_device() 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-reset-core-refactor-v2-6-5e5a7289190c@oss.qualcomm.com> References: <20260223-reset-core-refactor-v2-0-5e5a7289190c@oss.qualcomm.com> In-Reply-To: <20260223-reset-core-refactor-v2-0-5e5a7289190c@oss.qualcomm.com> To: Krzysztof Kozlowski , Philipp Zabel Cc: linux-kernel@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2926; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=/jjMTVDR3mYie9Ncx8hCNOw7mqA4MQBimid9vXcyuh8=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBpnCalcZosTfUXDoGA7GriMo92ZzsgUwOa70o1G T85cpBrZYaJAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCaZwmpQAKCRAFnS7L/zaE wwDoD/9aURdvq1PeNE3Fdw2rj80UF+2TV9MRmJv+0rL7mvRMm1hj+blVcx63203hjIp6NZyh+xx W55kCFxv9WKSElAU/MTHVbTbooQ5uKZon/TfPKSCr9V5znicUXaSIGa31LX9JpYAo2NNKlCsM58 4E+Yg4TO7Uxr8MvlVDfW9aV+LTfdQZUjQ/8XZMB0/d6Z9ARdcTqSA4WmTlRQlyhGnTOklQ9z1eS C8HMZQWq1zswSpibALA3fakDh9nEhJJBBB3dlMVR/rd2clX1TLrN+ZHaoUMBw09fHUl5XeRm2ZA jCG+CGO1n5zwEst0bdKSGEcUJWZUZ7QYQpZYVrwHcC8wPQPQq4tuSOOhP8vOHXwV5zJdxsbcjkn hfZg/SXqD9y8WIgdH3YCCWlsj4rztw9WZSUd8u7+shmYqxV8xegP2kfEeIleQ3qkeuSW5eB1aAh ICcpRs46y3sL5moAEI8u5+ZlSBa75hPEO1x/PEYrB03nave/+sEqPWoFnvNvrL2jbo87kz5Kyk2 Ge/rNy3VbVMY2oO49on+x9oMe5BYY255UH0p2n47YH5ae0a2KXQDchCuEuWiLNNOSNE0sZuIerI I9OHrLMGa/ROJbM6wZAqMdM4L2HtdUC1AApcZHzOUQpg08PpDGWi2gG3pCXnvwZfl3xOMXDSz2Q N/nKCx/rYxCR+nw== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjIzMDA4NiBTYWx0ZWRfX//F3rJmg9N05 bRZpJD/KFE15Qgoh39xt7vjALS0TklHRZ1CYMFjJZMs37h1eUxinVpBZ8TzdZssqnyOvAgrG8kn mpqe5v96W/QdlBWvS+CH07RNYBUz54f99TJ8WABYsA5JSqOJnsyFmRmk56ikqFPO+0bc+2xSU+r OxpjR1d+zMaBvVD2W4nr9JZ9ahWHRlqRiSZsoaFqF+OoUCR8tcDvOWex/YHo7OoIyVsHuAsSRtS vwp+VuPzRQxAPtUcnAxhgECSEBN740uxke1ywxQa4LljY2z8DsNh3kd/cCNKPsBxHvR85OMYQSJ UnrHanOiOe5n6L3WalfMsILZSqh8Ih/iXagFhLPzumNFCMLBU5TdVmHrcMz8YGx7Gg90/zjtnd5 DJTwJ9GYaLDbghXW9/c3HGHvJU7qvQDO6OVpWZknTMg+zaAwZT14GoDGJ2JVFMnRODuQA41KL8I 8lyVYX41ETxbpB6WILA== X-Authority-Analysis: v=2.4 cv=T5KBjvKQ c=1 sm=1 tr=0 ts=699c26b4 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=HM6bUx3eE857ULQHB2EA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-GUID: kg9T8czNKks9mCfqkxGTEj82siNzoNcW X-Proofpoint-ORIG-GUID: kg9T8czNKks9mCfqkxGTEj82siNzoNcW 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 suspectscore=0 spamscore=0 malwarescore=0 priorityscore=1501 clxscore=1015 phishscore=0 lowpriorityscore=0 adultscore=0 impostorscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2602230086 We don't need to know the IDA value outside of the function that creates the auxiliary reset-gpio device. Simplify error handling by folding it into reset_create_gpio_aux_device(). Signed-off-by: Bartosz Golaszewski --- drivers/reset/core.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/reset/core.c b/drivers/reset/core.c index 3e55f794d539e4edc99104cb5396cac72ba30618..025004989595ac60381804a7705a1eb584b63326 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -824,10 +824,14 @@ static void reset_gpio_aux_device_release(struct device *dev) } static int reset_create_gpio_aux_device(struct reset_gpio_lookup *rgpio_dev, - struct device *parent, int id) + struct device *parent) { struct auxiliary_device *adev = &rgpio_dev->adev; - int ret; + int ret, id; + + id = ida_alloc(&reset_gpio_ida, GFP_KERNEL); + if (id < 0) + return -ENOMEM; adev->id = id; adev->name = "gpio"; @@ -837,12 +841,15 @@ static int reset_create_gpio_aux_device(struct reset_gpio_lookup *rgpio_dev, device_set_node(&adev->dev, rgpio_dev->swnode); ret = auxiliary_device_init(adev); - if (ret) + if (ret) { + ida_free(&reset_gpio_ida, id); return ret; + } ret = __auxiliary_device_add(adev, "reset"); if (ret) { auxiliary_device_uninit(adev); + ida_free(&reset_gpio_ida, id); return ret; } @@ -891,7 +898,7 @@ static int __reset_add_reset_gpio_device(struct device_node *np, unsigned int offset, of_flags, lflags; struct reset_gpio_lookup *rgpio_dev; struct device *parent; - int id, ret, prop = 0; + int ret, prop = 0; /* * Currently only #gpio-cells=2 is supported with the meaning of: @@ -951,16 +958,10 @@ static int __reset_add_reset_gpio_device(struct device_node *np, properties[prop++] = PROPERTY_ENTRY_STRING("compatible", "reset-gpio"); properties[prop++] = PROPERTY_ENTRY_GPIO("reset-gpios", parent->fwnode, offset, lflags); - id = ida_alloc(&reset_gpio_ida, GFP_KERNEL); - if (id < 0) - return id; - /* Not freed on success, because it is persisent subsystem data. */ rgpio_dev = kzalloc_obj(*rgpio_dev); - if (!rgpio_dev) { - ret = -ENOMEM; - goto err_ida_free; - } + if (!rgpio_dev) + return -ENOMEM; rgpio_dev->of_args = *args; /* @@ -976,7 +977,7 @@ static int __reset_add_reset_gpio_device(struct device_node *np, goto err_put_of_node; } - ret = reset_create_gpio_aux_device(rgpio_dev, parent, id); + ret = reset_create_gpio_aux_device(rgpio_dev, parent); if (ret) goto err_del_swnode; @@ -990,8 +991,6 @@ static int __reset_add_reset_gpio_device(struct device_node *np, err_put_of_node: of_node_put(rgpio_dev->of_args.np); kfree(rgpio_dev); -err_ida_free: - ida_free(&reset_gpio_ida, id); return ret; } -- 2.47.3