Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Yangtao Li <frank.li@vivo.com>
To:     Richard Weinberger <richard@nod.at>
Cc:     Yangtao Li <frank.li@vivo.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        Damien Le Moal <damien.lemoal@opensource.wdc.com>,
        linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 05/10] ubifs: convert to kobject_del_and_put()
Date:   Thu, 23 Mar 2023 00:59:00 +0800
Message-Id: <20230322165905.55389-4-frank.li@vivo.com>
In-Reply-To: <20230322165905.55389-1-frank.li@vivo.com>
References: <20230322165905.55389-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?E5utXRMp2izd11Qlu2O9ryZY+NvvFBdzrCZOElIip+WOWrheOlwta9vzgFue?=
 =?us-ascii?Q?T+XFvT3Eeyob3lePU2jnoF/wrceQ7pvB9xYaVhlkvEs9KRJx/U1V2y/nAzCD?=
 =?us-ascii?Q?qOQfRYn0pQA63ZYQBukGwDtkXjFRjbW4iNC9fZGsMzqdmidBHNzKJ2JUDm5t?=
 =?us-ascii?Q?pmvunU8RA/7glDQOhjqvcRqsMf02iIUifx7TtolOjM6sx8wQZuvpavJpRcrk?=
 =?us-ascii?Q?4ho9HLwdSDXpB3xRFrgX+PPGxbt58FjMBszXTIcfWAnyN6s5EC09JFgoSyKo?=
 =?us-ascii?Q?eBX4tHKaGFKy41o72fVjiZTG5fA2dicki4+wpMILdvUlfpsKjdnuER7Esdii?=
 =?us-ascii?Q?90Fc+id3n5g9Kc0ZUo7lUTkIrHJIy4yKhg0uWss5bGP7gLICN600CBZUw8oS?=
 =?us-ascii?Q?6LRuIdyzzCOR3QUPOgRSOWwRZpWDC7bAA84a+KRQEpnGDyP063DEVtOpwhgk?=
 =?us-ascii?Q?xovtM+zhgvskivClZnvmArFMNWutLvAvamFmB6Ptgp3IhApEAinYR1sKhPNH?=
 =?us-ascii?Q?MXZAC+d8zEWa+r5FhNIOrXEWyxP75K+61VwDmfjpV0yDaw/YXkSpSUFnSeQD?=
 =?us-ascii?Q?a+BH99LsvPZiBZHSlzVvzB5M3Tab0WfWALK42765CMH4tp/EPnKpW3k9A6v8?=
 =?us-ascii?Q?3Wc3AAODh3tdQkczqibZQ54AdJtLsDPW44dmRG8Yhf43PC9416wGGLCCPax3?=
 =?us-ascii?Q?Gt755tgHLfhzNNqV9i4bZqMc4KheZkghZ3HG/i6ePbVIvCcDjj2dciTCEc4Z?=
 =?us-ascii?Q?47cFx3wNPm8NWeVkRqqYDkO6FNA4bQA4seNFqdkNjwvNaEwpNDEShuHTb9ni?=
 =?us-ascii?Q?sBlySi2782FIIs+QWyugxtENP91ehKBR0Hp5vZZfJW8/Ukk+mNN+VEq0e00f?=
 =?us-ascii?Q?2j+bbVCZ8jkD8E7gq2H1AtJS2lmnetK2jFRkCNpvi4WJvJLCqYL/of/K1bZ3?=
 =?us-ascii?Q?9blv2iQDsxOA4fWDGu9WjaDx0MY7KaE9bb2XZk7szNhDH7kbe4ud/mEJh6SH?=
 =?us-ascii?Q?3eLQgrXWRKL9hXy5uPJ7hRlocAJJ6wl9JT8HsIxkfVIUoWbuWqDrgzl1LdHw?=
 =?us-ascii?Q?6d+flKfDNQxwW0Zbro7QYBhspsCVkGp512mMNhu9hTKBkK9uqfoqaQTPsEX+?=
 =?us-ascii?Q?8d4oY0SW3JQBrV+vAwCy6Xs+bUTqsap/MDAQRuk8B9pOVNtydT+oSf8kzISd?=
 =?us-ascii?Q?bKFdgFdONFdSTLbwI0k2e8NzN8/Sp7mDwIlyWoxFHrLV0nWH1QUWVm2Hd/vW?=
 =?us-ascii?Q?HyxTYLXjbECgVeaFWT9416Bt+ZwVXgw1eD4Ht672AXUpJIAsUph6bg9FMD2r?=
 =?us-ascii?Q?yEOn5RlhslWM1HVK/91CVSdwq1lo1Lvs4n0VF59f1dBAnfulB4Udzgw90jPL?=
 =?us-ascii?Q?9caJMk9QX2QUXxfOafURnsjwGgndGyQukzVZJfx3uS65GyVAEie2oRTdN+AJ?=
 =?us-ascii?Q?FDPbYZFsD0twI3oDa9b57ZBjOuOrVGpAEz0jGnDPMnEBtBGR5/l7PAZnkMO/?=
 =?us-ascii?Q?P22695aPybuewI7eUrJJ+mCPGoN+o85pMIJMYNvSbrq8x2P5iVv/M3u6M0vE?=
 =?us-ascii?Q?P/jtsmZZqA+UQ2tWJFnH2sNbT4CTTY0iSguXKwWb?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 574b2aea-b45a-4289-6fa4-08db2af6d564
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2023 16:59:43.6788
 (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: /zjgb+F1bBo8UWrfX7aNQlrnq+N+zKL8z7UO27F/t7N9DX/0WxT4FfBZrawbNUueRSShVvsh92TONJYO4pIaSg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB5238
X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=unavailable
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Use kobject_del_and_put() to simplify code.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/ubifs/sysfs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/ubifs/sysfs.c b/fs/ubifs/sysfs.c
index 1c958148bb87..9571718e61a9 100644
--- a/fs/ubifs/sysfs.c
+++ b/fs/ubifs/sysfs.c
@@ -130,8 +130,7 @@ int ubifs_sysfs_register(struct ubifs_info *c)
 
 void ubifs_sysfs_unregister(struct ubifs_info *c)
 {
-	kobject_del(&c->kobj);
-	kobject_put(&c->kobj);
+	kobject_del_and_put(&c->kobj);
 	wait_for_completion(&c->kobj_unregister);
 
 	kfree(c->stats);
-- 
2.35.1