From:   Yangtao Li <frank.li@vivo.com>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Rafael J. Wysocki" <rafael@kernel.org>
Cc:     Yangtao Li <frank.li@vivo.com>, linux-kernel@vger.kernel.org
Subject: [PATCH v2, RESEND 01/10] kobject: introduce kobject_del_and_put()
Date:   Sun, 19 Mar 2023 17:26:32 +0800
Message-Id: <20230319092641.41917-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?o4m0N1LlGV7da3PMiuSqsRY6JDc4BuG/MtkZzw1vnKHZdjveDFyP1QeByJm8?=
 =?us-ascii?Q?XcFSP1b7CXpGHK/M11zkZaMndNAYSCbnOfC5E7QXhKy80mogvcK21Xdn40NC?=
 =?us-ascii?Q?PJGwCdA+vHMr+tA/cXtsVL7hz2Em2jo0rWfH67QKMRzBS3nVwJewUbJz4mm+?=
 =?us-ascii?Q?86g8L45HlMBWQ69atd24z/UDKSK69KW/YYidjtSaNAILlWB2SLPVqLduz1Vd?=
 =?us-ascii?Q?RmBmTzT6ukBngQSlxxhzJUYR7Y92AsX/Z5GiKq46EMAXmqBHSNBwp7y7J2GV?=
 =?us-ascii?Q?NyEyI+JysXwWj7sc4L8U/BCIhJ2Go/2HHhhRv2n267qKp9eYcykune5kwuLf?=
 =?us-ascii?Q?+YGw7R3Qg/HVCrekA6QuZ+T/XeKJnxvqfRoJer53HI1IJzOByANhKdS7H3tS?=
 =?us-ascii?Q?7UzQ0Dd5kyQmkiytno6ELR+NFcX1BjmE3QeU53m+ZdqigdTRvXom1gxfYn4l?=
 =?us-ascii?Q?5OJMd9byRmpPz3o8lEZsQqr2sTtDzHvwWvE4BGasCXFc56/H0CwFfkOIR4/v?=
 =?us-ascii?Q?pv4yNefejgdkivAPDT1NnDdmTSP2CIiEQD8Ry9v0lfBD2jTbViugLLqe0Fes?=
 =?us-ascii?Q?xWzrcrlWM11zOQRFxOy6NWxs98mh8j8o+CrqQqQzj6NLaV2sSeswRiD0W6QC?=
 =?us-ascii?Q?LC3q+AMwuZ9A82mCOC3lhrdX6WkiaZSykgP/2N+9xPjGSwR8ZgP+DMdS88gI?=
 =?us-ascii?Q?gRhvz1XTo9prSfhzF4ZY6nHLofzd6nNYzCESrz8ibRh6N+ZQWDVcOVPcEWyM?=
 =?us-ascii?Q?Lhm2tqa1/wHqYLOE80F7q9ToxnBkwPV+5CV9S3N7i6You/bI9V2+12QRKATi?=
 =?us-ascii?Q?sz+boE34F+XnvNucSxj75Sw5E0HxdT73yjWnB8hT/088wQPImNSYP7pbqeIn?=
 =?us-ascii?Q?9z2TJwpA/+RSq9/03MWUF/2FPBopIDRi9jCQx5RC7WQ1fbCPGk26fNZPlajN?=
 =?us-ascii?Q?0cOvUz2fwja2X6WEGW/U+HbtPir8xEkOFC9QZia0FNwYxpyvISKhJyp7cakz?=
 =?us-ascii?Q?Zye6CanaGJN2rPvXb7g5giW/kw28eOxWd/Ofk83qi31CNkSTPqF6bSnPDcgI?=
 =?us-ascii?Q?R/62uUas+QyKHnY1n2ZRQq6VWhL/62q7By1IQ+hNdU4yfSWJytYnrjdyBeWd?=
 =?us-ascii?Q?iOpY12hG52AF59Fh68fQTQ4BciMpDNnkhmam+EynJlMfGuPec8aNY68oqSng?=
 =?us-ascii?Q?q2yEXuzkg5rGdhMqSXDBJtR5t7ecF1+oiqHVvSkbAjeNW9LQZACzqMb9ThqO?=
 =?us-ascii?Q?NQ/hytwL4TjrBacA1VOrj/0HUMlRKOK/8wG3z9iny12iyH1lAdOnvx8emaVI?=
 =?us-ascii?Q?DTpww7/BBzX3XYZlvWTodQ4R02MF1w/5JgvrODjGjPneP650u9d7tumooUtd?=
 =?us-ascii?Q?1ywv+Kgm3wZWz70vjT+Rz+/U0uwiy7G+GtrEZEujW7EdDG3mer64+N19vQgh?=
 =?us-ascii?Q?d+jQW3Buf9e4tQuMMWXfZoGYfFJ3lzI7mfUiRzzBhaYcYMEoNhysp1hMRk27?=
 =?us-ascii?Q?StZJkMT8ofw4YM+qlwtmMZwKEzH5oCt98kNr0dCCS4jYqGseAljj8yT3JzQ+?=
 =?us-ascii?Q?mgyusFTefhaLv2mmKRAEsfCl7OQ/kBOf/bJsRnAq?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b7655930-280f-42ba-8f6f-08db285c1ac2
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2023 09:27:05.5367
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: JjnrRdtaUQvX3jPVse/tT2/yjMKQHR0eOfAbuNNhdiIQVanJyhpGnirTgdSZi2id6nj9Hv9cn5ov78ciShW5wQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4012
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

There are plenty of using kobject_del() and kobject_put() together
in the kernel tree. This patch wraps these two calls in a single helper.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
v2:
-add kobject_del_and_put() users
resend patchset to gregkh and Rafael
 include/linux/kobject.h |  1 +
 lib/kobject.c           | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index bdab370a24f4..782d4bd119f8 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -111,6 +111,7 @@ extern struct kobject *kobject_get(struct kobject *kobj);
 extern struct kobject * __must_check kobject_get_unless_zero(
 						struct kobject *kobj);
 extern void kobject_put(struct kobject *kobj);
+extern void kobject_del_and_put(struct kobject *kobj);
 
 extern const void *kobject_namespace(const struct kobject *kobj);
 extern void kobject_get_ownership(const struct kobject *kobj,
diff --git a/lib/kobject.c b/lib/kobject.c
index 6e2f0bee3560..8c0293e37214 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -731,6 +731,20 @@ void kobject_put(struct kobject *kobj)
 }
 EXPORT_SYMBOL(kobject_put);
 
+/**
+ * kobject_del_and_put() - Delete kobject.
+ * @kobj: object.
+ *
+ * Unlink kobject from hierarchy and decrement the refcount.
+ * If refcount is 0, call kobject_cleanup().
+ */
+void kobject_del_and_put(struct kobject *kobj)
+{
+	kobject_del(kobj);
+	kobject_put(kobj);
+}
+EXPORT_SYMBOL_GPL(kobject_del_and_put);
+
 static void dynamic_kobj_release(struct kobject *kobj)
 {
 	pr_debug("kobject: (%p): %s\n", kobj, __func__);
@@ -874,8 +888,7 @@ void kset_unregister(struct kset *k)
 {
 	if (!k)
 		return;
-	kobject_del(&k->kobj);
-	kobject_put(&k->kobj);
+	kobject_del_and_put(&k->kobj);
 }
 EXPORT_SYMBOL(kset_unregister);
 
-- 
2.35.1