From patchwork Thu Feb 20 13:44:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 866899 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (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 2468D1FAC48; Thu, 20 Feb 2025 14:16:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740061013; cv=none; b=YWJlXdMXzdLHIoNZmlDJ9u/nD6PvuCtP/yzR0CXp/zUuLvgQvh+fMzATZlEBB+0/UiYbiMpC2v4jfeWIBHTWodDZFtnC4fA0nQK9Xx/9p1d30Krg/JaoHrH/APreWjYCINghB1ugK0VKHbKMJsqsAzDziX8SvpaQfORBQ+Mt4/w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740061013; c=relaxed/simple; bh=c+XYcdsx3LxbWkPk4hBwmBuO2Tum6Qs2Q8FslfASiVo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ck6q3JdQCoOj966nd7hIQM+WL6lzpRf3gjxC4TYWavlAKj3Xd8dtouEOrWdJQG7IpZa76Dr5oSpaP8hzNfBiOMCNlRPw858XJz/WSvdOVsRqIVUr4rvG5810O4/hCPeuBvgYCskqquWhkTo/gKGxPlJlnIiiTj49du0ECaLOOiY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Msq7p15t; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none 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="Msq7p15t" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1740061012; x=1771597012; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=c+XYcdsx3LxbWkPk4hBwmBuO2Tum6Qs2Q8FslfASiVo=; b=Msq7p15t3RCR+Fo5677hrwQ1usAiDWvJE8H70RKBaTv/ZReRCoXG2WiB 1VZ7KS1743o2Xrd59Dduyqmo3qxCDg8dMWk0Ez85Q3nH2EeMS+6/ND+pv yeowQ5cICdlD0Gj0bTx/J5XwMMyJD4X8pU+NnMR59Ew6L6YCaL8EYw1rS jEPCV0mvBeh1UTIfVVniiKI8oP/7B+QIXCD5KsWEChLFzlR3mfx5ewaMa hm1thYoDAgWaVDxYglxYalUavvOb4iaIDxLKklOwCBQMw81ocF/7BjXv+ i2ujz2EWBKCSuB+XhlHvq7kVybNRNsB4lU8v36LanxHTVwRIT5FdpMBEv A==; X-CSE-ConnectionGUID: QIEiHvzqRl6yNrXjdZqpkQ== X-CSE-MsgGUID: Ui7GJLR3QZyInyK1uS6F5A== X-IronPort-AV: E=McAfee;i="6700,10204,11351"; a="51458100" X-IronPort-AV: E=Sophos;i="6.13,301,1732608000"; d="scan'208";a="51458100" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Feb 2025 06:16:49 -0800 X-CSE-ConnectionGUID: +++IxEV5Rr6njTpQJL1C/g== X-CSE-MsgGUID: a2S1XeIuT/GfcPa4R/jKoA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,301,1732608000"; d="scan'208";a="114883159" Received: from black.fi.intel.com ([10.237.72.28]) by fmviesa006.fm.intel.com with ESMTP; 20 Feb 2025 06:16:47 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 45CD673; Thu, 20 Feb 2025 16:16:46 +0200 (EET) From: Andy Shevchenko To: Greg Kroah-Hartman , Zijun Hu , Andy Shevchenko , Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org Cc: "Rafael J. Wysocki" , Danilo Krummrich , Linus Walleij , Bartosz Golaszewski Subject: [PATCH v1 1/4] devres: Move devm_*_action*() APIs to devres.h Date: Thu, 20 Feb 2025 15:44:57 +0200 Message-ID: <20250220141645.2694039-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.45.1.3035.g276e886db78b In-Reply-To: <20250220141645.2694039-1-andriy.shevchenko@linux.intel.com> References: <20250220141645.2694039-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We have a newly created header linux/device/devres.h that gathers device managed APIs, so users won't need to include entire device.h for only these ones. Move devm_*_action*() APIs to devres.h as well. Signed-off-by: Andy Shevchenko --- include/linux/device.h | 38 ---------------------------------- include/linux/device/devres.h | 39 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/include/linux/device.h b/include/linux/device.h index 78ca7fd0e625..d6341a05e4fb 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -281,44 +281,6 @@ int __must_check device_create_bin_file(struct device *dev, void device_remove_bin_file(struct device *dev, const struct bin_attribute *attr); -/* allows to add/remove a custom action to devres stack */ -int devm_remove_action_nowarn(struct device *dev, void (*action)(void *), void *data); - -/** - * devm_remove_action() - removes previously added custom action - * @dev: Device that owns the action - * @action: Function implementing the action - * @data: Pointer to data passed to @action implementation - * - * Removes instance of @action previously added by devm_add_action(). - * Both action and data should match one of the existing entries. - */ -static inline -void devm_remove_action(struct device *dev, void (*action)(void *), void *data) -{ - WARN_ON(devm_remove_action_nowarn(dev, action, data)); -} - -void devm_release_action(struct device *dev, void (*action)(void *), void *data); - -int __devm_add_action(struct device *dev, void (*action)(void *), void *data, const char *name); -#define devm_add_action(dev, action, data) \ - __devm_add_action(dev, action, data, #action) - -static inline int __devm_add_action_or_reset(struct device *dev, void (*action)(void *), - void *data, const char *name) -{ - int ret; - - ret = __devm_add_action(dev, action, data, name); - if (ret) - action(data); - - return ret; -} -#define devm_add_action_or_reset(dev, action, data) \ - __devm_add_action_or_reset(dev, action, data, #action) - /** * devm_alloc_percpu - Resource-managed alloc_percpu * @dev: Device to allocate per-cpu memory for diff --git a/include/linux/device/devres.h b/include/linux/device/devres.h index 9b49f9915850..9cd1787ef28e 100644 --- a/include/linux/device/devres.h +++ b/include/linux/device/devres.h @@ -8,6 +8,7 @@ #include #include #include +#include struct device; struct device_node; @@ -126,4 +127,42 @@ void __iomem *devm_of_iomap(struct device *dev, struct device_node *node, int in #endif +/* allows to add/remove a custom action to devres stack */ +int devm_remove_action_nowarn(struct device *dev, void (*action)(void *), void *data); + +/** + * devm_remove_action() - removes previously added custom action + * @dev: Device that owns the action + * @action: Function implementing the action + * @data: Pointer to data passed to @action implementation + * + * Removes instance of @action previously added by devm_add_action(). + * Both action and data should match one of the existing entries. + */ +static inline +void devm_remove_action(struct device *dev, void (*action)(void *), void *data) +{ + WARN_ON(devm_remove_action_nowarn(dev, action, data)); +} + +void devm_release_action(struct device *dev, void (*action)(void *), void *data); + +int __devm_add_action(struct device *dev, void (*action)(void *), void *data, const char *name); +#define devm_add_action(dev, action, data) \ + __devm_add_action(dev, action, data, #action) + +static inline int __devm_add_action_or_reset(struct device *dev, void (*action)(void *), + void *data, const char *name) +{ + int ret; + + ret = __devm_add_action(dev, action, data, name); + if (ret) + action(data); + + return ret; +} +#define devm_add_action_or_reset(dev, action, data) \ + __devm_add_action_or_reset(dev, action, data, #action) + #endif /* _DEVICE_DEVRES_H_ */ From patchwork Thu Feb 20 13:44:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 867560 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (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 0610835958; Thu, 20 Feb 2025 14:16:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740061012; cv=none; b=CX4yydRjwXRKLzSoKsRuOQvfPke04NSfsZ/3NG+R7e+QpkDZ82KWKlCavqPfFslBBgUhXgzayqVWzzHxi0nAKf/S1/4sGOYzW+/MnVBd/OmIsgFt4lgsy2ziLoPr3xjNgkhuat471EuvfQPXVOackBHlOpjwMpRTqoa0HqthfRI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740061012; c=relaxed/simple; bh=oOmeDbKN6HlDBXMyw/mXw5Z8WJGf9Pl/P+tN6U5rzfc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H+0lkZ0SpBSfqBi+k0z4pVvDQ9mnRZ1Imm14qxQ7DT3xWHWjgunxNty2PIZCmVgRxqztm7PbtrfqfWUS4mm6Ri+42/qGN/G5FC35qtprbvK6ejSK+tGXdl0nhFf/QYCvHasuzQDimLLEgHEfj7zcbkZL72rkZj/Fdd3kFHhfv7w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=B65dYDVM; arc=none smtp.client-ip=192.198.163.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none 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="B65dYDVM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1740061011; x=1771597011; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oOmeDbKN6HlDBXMyw/mXw5Z8WJGf9Pl/P+tN6U5rzfc=; b=B65dYDVMdtXZCvQqB5nas9i2WkcU9zoBkzVJNz8EWqV2SllOuWW9Sqj3 coa8HtKKg0m8Sr55oVbgCIKFpBBbOKv6hYuc6t5nUAdTmCvJjJ8rt/AoC hiJ8KVul3hrvCe0wo8qEVBz85gbUOlAoOGG+F2G9tZ5RDyB5U6H53XIW/ 9ZzuE6Id0UTOvs4cgs4osQJDE/uhyS0cEXfwB7InbZI6nqW+EOfiwi5mH sYCYBgZYsHQy72HVmNiS4eMIP8X3pAwWYNg25t3M4uzaQ61bTI1LBs+ld WXNBvCoa6UWzV+CjM6a83GVSP43d/7wGRn3MS8NLuTYL2KVCpFSX7dJMd Q==; X-CSE-ConnectionGUID: /9eKSDLhQhOJWfYEuh25XQ== X-CSE-MsgGUID: J+pTkJcjSu6I42CK+Rsjrw== X-IronPort-AV: E=McAfee;i="6700,10204,11351"; a="43673102" X-IronPort-AV: E=Sophos;i="6.13,301,1732608000"; d="scan'208";a="43673102" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Feb 2025 06:16:50 -0800 X-CSE-ConnectionGUID: 2rCuDBcLQFi4vP/Uuk54Ew== X-CSE-MsgGUID: YGFDi5iJQBO8vRmcda9PZA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="115956008" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa008.jf.intel.com with ESMTP; 20 Feb 2025 06:16:48 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 5C2CC48F; Thu, 20 Feb 2025 16:16:46 +0200 (EET) From: Andy Shevchenko To: Greg Kroah-Hartman , Zijun Hu , Andy Shevchenko , Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org Cc: "Rafael J. Wysocki" , Danilo Krummrich , Linus Walleij , Bartosz Golaszewski Subject: [PATCH v1 2/4] devres: Add devm_is_action_added() helper Date: Thu, 20 Feb 2025 15:44:58 +0200 Message-ID: <20250220141645.2694039-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.45.1.3035.g276e886db78b In-Reply-To: <20250220141645.2694039-1-andriy.shevchenko@linux.intel.com> References: <20250220141645.2694039-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In some code we would like to know if the action in device managed resources was added by devm_add_action() family of calls. Introduce a helper for that. Signed-off-by: Andy Shevchenko --- drivers/base/devres.c | 11 +++++++++++ include/linux/device/devres.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/drivers/base/devres.c b/drivers/base/devres.c index 93e7779ef21e..7c2babfa9396 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -749,6 +749,17 @@ int __devm_add_action(struct device *dev, void (*action)(void *), void *data, co } EXPORT_SYMBOL_GPL(__devm_add_action); +bool devm_is_action_added(struct device *dev, void (*action)(void *), void *data) +{ + struct action_devres devres = { + .data = data, + .action = action, + }; + + return devres_find(dev, devm_action_release, devm_action_match, &devres); +} +EXPORT_SYMBOL_GPL(devm_is_action_added); + /** * devm_remove_action_nowarn() - removes previously added custom action * @dev: Device that owns the action diff --git a/include/linux/device/devres.h b/include/linux/device/devres.h index 9cd1787ef28e..ae696d10faff 100644 --- a/include/linux/device/devres.h +++ b/include/linux/device/devres.h @@ -165,4 +165,6 @@ static inline int __devm_add_action_or_reset(struct device *dev, void (*action)( #define devm_add_action_or_reset(dev, action, data) \ __devm_add_action_or_reset(dev, action, data, #action) +bool devm_is_action_added(struct device *dev, void (*action)(void *), void *data); + #endif /* _DEVICE_DEVRES_H_ */ From patchwork Thu Feb 20 13:44:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 866900 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (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 822FA1F150A; Thu, 20 Feb 2025 14:16:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740061012; cv=none; b=JkLwxieNsDS+7rO+KF45xMtdrcGxp1cVFTMbrcU5ThNTtA5XncLpcNBeQotMP5xRne9DWfzPip20a7qxIxZKhJfKarIUWwyjSXvG5KsdOYUaQuDh/WQgOTc18gdsFRpKgOV4TJKkw0SDQARiGMV27KXTvb9e3B8GpjUm52vSwX4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740061012; c=relaxed/simple; bh=QbBaaoCw/NPHuhr2EOc+gN+Y9OLuszesOW/i0ccT8E8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A+UkSVTYk6Jx9a79ZnUhfp3FwFCz38XLL5GiVVK2W8PwEPuhNHUmsrNq1XHSrA9Yl4Vsi/UTchl9JB8zOCDQWIbEUUl3/8PqLdA5PwHGYHF7nsIS1iPhm4HNpAGSyZgS3tGiwPK/RnDVPdwTIlKPBtFpaUP8vyFhdFnIc79+0k8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=TnZ3YCp5; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none 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="TnZ3YCp5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1740061010; x=1771597010; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QbBaaoCw/NPHuhr2EOc+gN+Y9OLuszesOW/i0ccT8E8=; b=TnZ3YCp5goIIqLF/bj/Skg9yL0RylnNZOzchMFN136Yz2EHJEOsQgDod TRKm8I7p2kTlvv3hMMiOmnCqPGT3ZrWyrRd7/D/k1V8MPv1ogzP8a9ND0 x1e2cHzF4FNYsON3v4Ng+SrRsrd72LERHiV8+x4DEm4fXWhvWge/JYi+x U14Mb3An7Fi+a2lhcao3Z0/A9NLAm52Zi4PBBTjpwP8nYAysPGX4TH8bG 7vmFncKbx69S4tTL7jftP8neE42AH9DVCNaYQunUZh1nY1UCqFDv82eVb 6w0bCJPdXNkz+7AXVtltzlxE0fzoZnySWfsxAjoZqLOr+5Sk2iQdO+gl3 w==; X-CSE-ConnectionGUID: vyt8YD84TTe8JmKfLoLrvA== X-CSE-MsgGUID: iBTQTrthQJewx3eYfDlh4Q== X-IronPort-AV: E=McAfee;i="6700,10204,11351"; a="51458089" X-IronPort-AV: E=Sophos;i="6.13,301,1732608000"; d="scan'208";a="51458089" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Feb 2025 06:16:49 -0800 X-CSE-ConnectionGUID: B+zEdYltQgmq1oQOwJ8P5A== X-CSE-MsgGUID: 6x+0T9P4S7eFzXihlSIAGA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,301,1732608000"; d="scan'208";a="114883158" Received: from black.fi.intel.com ([10.237.72.28]) by fmviesa006.fm.intel.com with ESMTP; 20 Feb 2025 06:16:47 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 66B732D0; Thu, 20 Feb 2025 16:16:46 +0200 (EET) From: Andy Shevchenko To: Greg Kroah-Hartman , Zijun Hu , Andy Shevchenko , Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org Cc: "Rafael J. Wysocki" , Danilo Krummrich , Linus Walleij , Bartosz Golaszewski Subject: [PATCH v1 3/4] devres: Add devm_remove_action_optional() helper Date: Thu, 20 Feb 2025 15:44:59 +0200 Message-ID: <20250220141645.2694039-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.45.1.3035.g276e886db78b In-Reply-To: <20250220141645.2694039-1-andriy.shevchenko@linux.intel.com> References: <20250220141645.2694039-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add a new helper to remove an action that was added via devm_add_action() family of calls, but not warn in the cases where action wasn't found since it is optional and wasn't even added. Signed-off-by: Andy Shevchenko --- include/linux/device/devres.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/linux/device/devres.h b/include/linux/device/devres.h index ae696d10faff..4daebbf7f227 100644 --- a/include/linux/device/devres.h +++ b/include/linux/device/devres.h @@ -145,6 +145,19 @@ void devm_remove_action(struct device *dev, void (*action)(void *), void *data) WARN_ON(devm_remove_action_nowarn(dev, action, data)); } +/* Same as devm_remove_action(), but doesn't WARN() if action wasn't added before */ +static inline +void devm_remove_action_optional(struct device *dev, void (*action)(void *), void *data) +{ + int ret; + + ret = devm_remove_action_nowarn(dev, action, data); + if (ret == -ENOENT) + return; + + WARN_ON(ret); +} + void devm_release_action(struct device *dev, void (*action)(void *), void *data); int __devm_add_action(struct device *dev, void (*action)(void *), void *data, const char *name); From patchwork Thu Feb 20 13:45:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 867559 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (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 B3C1C1FBC8A; Thu, 20 Feb 2025 14:16:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740061014; cv=none; b=Ymun63+sB//dBvJxm/BGRdO9C4Cn/FD7f/ds7ptzL+ziRJh+DSLRSy/RIbNRdukvyig78mr0KCtgEr2Wc6qgG6xMMytN6xE+Dcje1e6A7QLrVztVX4VsIVui9SAt1cl+P6SvBloPJ6UxTGc7gRlpguhPdQUmYSyeYa0fVQfc8zg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740061014; c=relaxed/simple; bh=BCPHQofhz8XenMJrxuntRs0xrbwKAGNHcAnYlTPse0c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tXJ9RI5uAdLP33t3/raod83UWDoTqO8NiSEe5PF4JP92PZRnGF5BPos52U0cnhWxFSqpbR+0T8Hp7s6WjFMWpHf/9TsDQ8cHQ2ZUve5iCaLq8BSJglGwRjWGmrKuNqaVfu2cV5CVKK5RGlhSeykl+49bmbOqe3yhPcEvR1Q+wLU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=cA1q5pwE; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none 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="cA1q5pwE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1740061012; x=1771597012; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BCPHQofhz8XenMJrxuntRs0xrbwKAGNHcAnYlTPse0c=; b=cA1q5pwEM+UUSn7gfjmloSiLWhGPRhaurAChJozjO8LDr3G5swUe7DlA qrAnz57Srwn8J4DVYFw25T9wvdYMzCQmj8mZAffa0RCL2jprwhAvYOtyZ mnTy1y5kgdUioEfPNZM0kRxnba7THRLMj9pypwONTorouu/Gogwx8TvsY yXbUTBc931lPOjLHAmqZpIdvBkocYxEaxn5tJjLROIkqIUtiVE/hCOPWn JyI4lHQ/P+/4anhDGvpLP0NlTlpcK/Dhhnr1vI7e0I6xY6zzPOElxD18x Aq+T+WKOF9zeUDtFrYEsAzPpjaDAPA6lQGsHe9Z6qv/5vX2S5kXS/chIw g==; X-CSE-ConnectionGUID: +bymmNl1Re+U2WE0Uxo4RA== X-CSE-MsgGUID: LUBPfYqVQxyZMGi3buiV8g== X-IronPort-AV: E=McAfee;i="6700,10204,11351"; a="51458095" X-IronPort-AV: E=Sophos;i="6.13,301,1732608000"; d="scan'208";a="51458095" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Feb 2025 06:16:49 -0800 X-CSE-ConnectionGUID: Uegu/CWbRQW3/GgYMUBAIQ== X-CSE-MsgGUID: 2CKV+PnaQE+xaWfHn6sIMA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,301,1732608000"; d="scan'208";a="114883161" Received: from black.fi.intel.com ([10.237.72.28]) by fmviesa006.fm.intel.com with ESMTP; 20 Feb 2025 06:16:47 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 781174E8; Thu, 20 Feb 2025 16:16:46 +0200 (EET) From: Andy Shevchenko To: Greg Kroah-Hartman , Zijun Hu , Andy Shevchenko , Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org Cc: "Rafael J. Wysocki" , Danilo Krummrich , Linus Walleij , Bartosz Golaszewski Subject: [PATCH v1 4/4] gpiolib: devres: Finish the conversion to use devm_add_action() Date: Thu, 20 Feb 2025 15:45:00 +0200 Message-ID: <20250220141645.2694039-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.45.1.3035.g276e886db78b In-Reply-To: <20250220141645.2694039-1-andriy.shevchenko@linux.intel.com> References: <20250220141645.2694039-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 With new recently added helpers we can complete the conversion of the gpiolib code to use devm_add_action() in all suitable cases. So do this. Signed-off-by: Andy Shevchenko --- drivers/gpio/gpiolib-devres.c | 94 ++++++++++------------------------- 1 file changed, 25 insertions(+), 69 deletions(-) diff --git a/drivers/gpio/gpiolib-devres.c b/drivers/gpio/gpiolib-devres.c index 08205f355ceb..4338e21c9123 100644 --- a/drivers/gpio/gpiolib-devres.c +++ b/drivers/gpio/gpiolib-devres.c @@ -19,32 +19,14 @@ struct fwnode_handle; struct lock_class_key; -static void devm_gpiod_release(struct device *dev, void *res) +static void devm_gpiod_release(void *desc) { - struct gpio_desc **desc = res; - - gpiod_put(*desc); + gpiod_put(desc); } -static int devm_gpiod_match(struct device *dev, void *res, void *data) +static void devm_gpiod_release_array(void *descs) { - struct gpio_desc **this = res, **gpio = data; - - return *this == *gpio; -} - -static void devm_gpiod_release_array(struct device *dev, void *res) -{ - struct gpio_descs **descs = res; - - gpiod_put_array(*descs); -} - -static int devm_gpiod_match_array(struct device *dev, void *res, void *data) -{ - struct gpio_descs **this = res, **gpios = data; - - return *this == *gpios; + gpiod_put_array(descs); } /** @@ -114,8 +96,8 @@ struct gpio_desc *__must_check devm_gpiod_get_index(struct device *dev, unsigned int idx, enum gpiod_flags flags) { - struct gpio_desc **dr; struct gpio_desc *desc; + int ret; desc = gpiod_get_index(dev, con_id, idx, flags); if (IS_ERR(desc)) @@ -126,23 +108,16 @@ struct gpio_desc *__must_check devm_gpiod_get_index(struct device *dev, * already under resource management by this device. */ if (flags & GPIOD_FLAGS_BIT_NONEXCLUSIVE) { - struct devres *dres; + bool dres; - dres = devres_find(dev, devm_gpiod_release, - devm_gpiod_match, &desc); + dres = devm_is_action_added(dev, devm_gpiod_release, desc); if (dres) return desc; } - dr = devres_alloc(devm_gpiod_release, sizeof(struct gpio_desc *), - GFP_KERNEL); - if (!dr) { - gpiod_put(desc); - return ERR_PTR(-ENOMEM); - } - - *dr = desc; - devres_add(dev, dr); + ret = devm_add_action_or_reset(dev, devm_gpiod_release, desc); + if (ret) + return ERR_PTR(ret); return desc; } @@ -171,22 +146,16 @@ struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev, enum gpiod_flags flags, const char *label) { - struct gpio_desc **dr; struct gpio_desc *desc; - - dr = devres_alloc(devm_gpiod_release, sizeof(struct gpio_desc *), - GFP_KERNEL); - if (!dr) - return ERR_PTR(-ENOMEM); + int ret; desc = gpiod_find_and_request(dev, fwnode, con_id, index, flags, label, false); - if (IS_ERR(desc)) { - devres_free(dr); + if (IS_ERR(desc)) return desc; - } - *dr = desc; - devres_add(dev, dr); + ret = devm_add_action_or_reset(dev, devm_gpiod_release, desc); + if (ret) + return ERR_PTR(ret); return desc; } @@ -244,22 +213,16 @@ struct gpio_descs *__must_check devm_gpiod_get_array(struct device *dev, const char *con_id, enum gpiod_flags flags) { - struct gpio_descs **dr; struct gpio_descs *descs; - - dr = devres_alloc(devm_gpiod_release_array, - sizeof(struct gpio_descs *), GFP_KERNEL); - if (!dr) - return ERR_PTR(-ENOMEM); + int ret; descs = gpiod_get_array(dev, con_id, flags); - if (IS_ERR(descs)) { - devres_free(dr); + if (IS_ERR(descs)) return descs; - } - *dr = descs; - devres_add(dev, dr); + ret = devm_add_action_or_reset(dev, devm_gpiod_release_array, descs); + if (ret) + return ERR_PTR(ret); return descs; } @@ -307,8 +270,7 @@ EXPORT_SYMBOL_GPL(devm_gpiod_get_array_optional); */ void devm_gpiod_put(struct device *dev, struct gpio_desc *desc) { - WARN_ON(devres_release(dev, devm_gpiod_release, devm_gpiod_match, - &desc)); + devm_release_action(dev, devm_gpiod_release, desc); } EXPORT_SYMBOL_GPL(devm_gpiod_put); @@ -324,21 +286,16 @@ EXPORT_SYMBOL_GPL(devm_gpiod_put); void devm_gpiod_unhinge(struct device *dev, struct gpio_desc *desc) { - int ret; - if (IS_ERR_OR_NULL(desc)) return; - ret = devres_destroy(dev, devm_gpiod_release, - devm_gpiod_match, &desc); + /* * If the GPIO descriptor is requested as nonexclusive, we * may call this function several times on the same descriptor * so it is OK if devres_destroy() returns -ENOENT. + * Anything else we should warn about. */ - if (ret == -ENOENT) - return; - /* Anything else we should warn about */ - WARN_ON(ret); + devm_remove_action_optional(dev, devm_gpiod_release, desc); } EXPORT_SYMBOL_GPL(devm_gpiod_unhinge); @@ -353,8 +310,7 @@ EXPORT_SYMBOL_GPL(devm_gpiod_unhinge); */ void devm_gpiod_put_array(struct device *dev, struct gpio_descs *descs) { - WARN_ON(devres_release(dev, devm_gpiod_release_array, - devm_gpiod_match_array, &descs)); + devm_remove_action(dev, devm_gpiod_release_array, descs); } EXPORT_SYMBOL_GPL(devm_gpiod_put_array);