From nobody Mon Feb 9 21:18:42 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) (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 8F1CF341AA0; Tue, 27 Jan 2026 10:33:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769510014; cv=none; b=HBd+emmjQhZNORm/mDtlbjehZ8cYtLBhcKvHH6Mscl049PtDFYF1sYGCQ+IrZiIAbe3mYokkxYEqF2SopE3aGEtZCexbu2bcp2adLUKPcqsxQx7QroWpIjZGQ8Zz+0YR+gc3tpznTBA/oBRtzJH/s2jE0Vmrpmc4Cmg1QAcK3dQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769510014; c=relaxed/simple; bh=MP0MnsR/BquRxvUNp+TB4jwxKm3J5DHmTOVK3JU0UvI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZqUsYC7mqF3ewVamdAPgO9xK0VtBXBi2gqEiQjk3nRrafO4HrY6gp4AIT0QAtmrpoNHy8tDTmIXJvzDtG/L9vFMitDS8MF6FGGbTzNk+tUdegmxUbJ6cJ4E5d60KwWq9YBHXXOfnnpIAtUkZ0UVvFl8oYnihXqEyGuwS/ma6XYI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=kHiZfO4m; arc=none smtp.client-ip=198.175.65.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="kHiZfO4m" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1769510013; x=1801046013; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MP0MnsR/BquRxvUNp+TB4jwxKm3J5DHmTOVK3JU0UvI=; b=kHiZfO4m5gQi05xlmVyxzAnExr7sKNGuFxs47tspR6dJdBjrzXHupprV TMMnHLH6Gg+nEeCrS8tB8lmIw6SmdwFgKJ6lB4dfW8p/MWyhXAoq6xShi qASiS6Foyjb+mwn+mU26FNUS/54g7Ju/jAQ0nAJnYWLnXZDZf2LHgdjIp 7KKs2uc+WN5ZmvlPTPvKrujFSmQriYDD4r7LVZP3VcMupxy1hXMHUzAh8 hT7j1PO5TOymo4B8gRx9k/f02SwAjDo7ljueOaTwYHlpC5I/Si6vwbygg laB/P85S/ov6qXFTCZVXcFBhcRuriCb2S3RxxFdXrgvPa8tRx714PUiwy g==; X-CSE-ConnectionGUID: o/TBxanOSliIf51jmKSJ0A== X-CSE-MsgGUID: y/7YwD19T56wKsCFJRETNA== X-IronPort-AV: E=McAfee;i="6800,10657,11683"; a="93360009" X-IronPort-AV: E=Sophos;i="6.21,256,1763452800"; d="scan'208";a="93360009" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jan 2026 02:33:31 -0800 X-CSE-ConnectionGUID: Jhy0DzNlSsiX6QnAq/0nug== X-CSE-MsgGUID: cSR+34z2QIOlPYax2W11tA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,256,1763452800"; d="scan'208";a="208184406" Received: from black.igk.intel.com ([10.91.253.5]) by fmviesa008.fm.intel.com with ESMTP; 27 Jan 2026 02:33:27 -0800 Received: by black.igk.intel.com (Postfix, from userid 1003) id 993789B; Tue, 27 Jan 2026 11:33:26 +0100 (CET) From: Andy Shevchenko To: Andy Shevchenko , Philipp Stanner , Linus Walleij , Bartosz Golaszewski , driver-core@lists.linux.dev, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich , Jonathan Corbet , Shuah Khan Subject: [PATCH v1 2/3] pinctrl: core: Simplify devm_pinctrl_*() Date: Tue, 27 Jan 2026 11:32:07 +0100 Message-ID: <20260127103325.3925173-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260127103325.3925173-1-andriy.shevchenko@linux.intel.com> References: <20260127103325.3925173-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use devm_add_action_or_reset() instead of devres_alloc() and devres_add(), which works the same. This will simplify the code. There is no functional changes. Signed-off-by: Andy Shevchenko Reviewed-by: Bartosz Golaszewski --- drivers/pinctrl/core.c | 67 +++++++++++++----------------------------- 1 file changed, 20 insertions(+), 47 deletions(-) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index b2b86c4d8475..ebf803bff867 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -1383,9 +1383,9 @@ int pinctrl_select_state(struct pinctrl *p, struct pi= nctrl_state *state) } EXPORT_SYMBOL_GPL(pinctrl_select_state); =20 -static void devm_pinctrl_release(struct device *dev, void *res) +static void devm_pinctrl_release(void *p) { - pinctrl_put(*(struct pinctrl **)res); + pinctrl_put(p); } =20 /** @@ -1397,31 +1397,21 @@ static void devm_pinctrl_release(struct device *dev= , void *res) */ struct pinctrl *devm_pinctrl_get(struct device *dev) { - struct pinctrl **ptr, *p; - - ptr =3D devres_alloc(devm_pinctrl_release, sizeof(*ptr), GFP_KERNEL); - if (!ptr) - return ERR_PTR(-ENOMEM); + struct pinctrl *p; + int ret; =20 p =3D pinctrl_get(dev); - if (!IS_ERR(p)) { - *ptr =3D p; - devres_add(dev, ptr); - } else { - devres_free(ptr); - } + if (IS_ERR(p)) + return p; + + ret =3D devm_add_action_or_reset(dev, devm_pinctrl_release, p); + if (ret) + return ERR_PTR(ret); =20 return p; } EXPORT_SYMBOL_GPL(devm_pinctrl_get); =20 -static int devm_pinctrl_match(struct device *dev, void *res, void *data) -{ - struct pinctrl **p =3D res; - - return *p =3D=3D data; -} - /** * devm_pinctrl_put() - Resource managed pinctrl_put() * @p: the pinctrl handle to release @@ -1432,8 +1422,7 @@ static int devm_pinctrl_match(struct device *dev, voi= d *res, void *data) */ void devm_pinctrl_put(struct pinctrl *p) { - WARN_ON(devres_release(p->dev, devm_pinctrl_release, - devm_pinctrl_match, p)); + devm_release_action(p->dev, devm_pinctrl_release, p); } EXPORT_SYMBOL_GPL(devm_pinctrl_put); =20 @@ -2316,10 +2305,8 @@ void pinctrl_unregister(struct pinctrl_dev *pctldev) } EXPORT_SYMBOL_GPL(pinctrl_unregister); =20 -static void devm_pinctrl_dev_release(struct device *dev, void *res) +static void devm_pinctrl_dev_release(void *pctldev) { - struct pinctrl_dev *pctldev =3D *(struct pinctrl_dev **)res; - pinctrl_unregister(pctldev); } =20 @@ -2338,20 +2325,16 @@ struct pinctrl_dev *devm_pinctrl_register(struct de= vice *dev, const struct pinctrl_desc *pctldesc, void *driver_data) { - struct pinctrl_dev **ptr, *pctldev; - - ptr =3D devres_alloc(devm_pinctrl_dev_release, sizeof(*ptr), GFP_KERNEL); - if (!ptr) - return ERR_PTR(-ENOMEM); + struct pinctrl_dev *pctldev; + int ret; =20 pctldev =3D pinctrl_register(pctldesc, dev, driver_data); - if (IS_ERR(pctldev)) { - devres_free(ptr); + if (IS_ERR(pctldev)) return pctldev; - } =20 - *ptr =3D pctldev; - devres_add(dev, ptr); + ret =3D devm_add_action_or_reset(dev, devm_pinctrl_dev_release, pctldev); + if (ret) + return ERR_PTR(ret); =20 return pctldev; } @@ -2373,23 +2356,13 @@ int devm_pinctrl_register_and_init(struct device *d= ev, void *driver_data, struct pinctrl_dev **pctldev) { - struct pinctrl_dev **ptr; int error; =20 - ptr =3D devres_alloc(devm_pinctrl_dev_release, sizeof(*ptr), GFP_KERNEL); - if (!ptr) - return -ENOMEM; - error =3D pinctrl_register_and_init(pctldesc, dev, driver_data, pctldev); - if (error) { - devres_free(ptr); + if (error) return error; - } =20 - *ptr =3D *pctldev; - devres_add(dev, ptr); - - return 0; + return devm_add_action_or_reset(dev, devm_pinctrl_dev_release, *pctldev); } EXPORT_SYMBOL_GPL(devm_pinctrl_register_and_init); =20 --=20 2.50.1