From:   Yangtao Li <frank.li@vivo.com>
To:     Gao Xiang <xiang@kernel.org>, Chao Yu <chao@kernel.org>,
        Yue Hu <huyue2@coolpad.com>,
        Jeffle Xu <jefflexu@linux.alibaba.com>
Cc:     Yangtao Li <frank.li@vivo.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        linux-erofs@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2, RESEND 03/10] erofs: convert to kobject_del_and_put()
Date:   Sun, 19 Mar 2023 17:26:34 +0800
Message-Id: <20230319092641.41917-3-frank.li@vivo.com>
In-Reply-To: <20230319092641.41917-1-frank.li@vivo.com>
References: <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?amW+U2SyqghkRmvcE1MTAi7HQX5Ao4c05kkoAcZJOP/nq/jr5edwEFt/sIAy?=
 =?us-ascii?Q?uWCkwoSe6yn63gb3VXVumCZ4pvD0EAFk//yrSJn1D5hNqyQLn+fYEo1hLW0a?=
 =?us-ascii?Q?sgTPVDWKw+Jbo6CXk5bcDRrhYcs1gymth7ZtaCkMWSLpZ8cVPkT0W/l/G5Gg?=
 =?us-ascii?Q?WbJ6DKB3wr9iSF7VW8vzOAldPnZyiTCc9/TsUCX1znMWtOvuu+aQ4sHPgA7L?=
 =?us-ascii?Q?gCLcCQFMcmXOOPmmf74XiT3saKE5mDK0dlnMXALHJbIBPvFvD5iajueRKIRk?=
 =?us-ascii?Q?URoRV+OZk8ZidUBkrMM7L+pxyAYhPZRluqk9C3eSvl3ecevLxBAxqquLzhtM?=
 =?us-ascii?Q?BUGKkcaSOw4L/fQ1v8wjuSg3+K80DMigeRIv33ztDjxK/g268gd5x8PEmFdh?=
 =?us-ascii?Q?RP/3F7Y4levILou9UPQQ6gy0lPrrETD6/pbUgPCY4m/nfZ7T+SMuo1S+IUm9?=
 =?us-ascii?Q?YdQBFq4aiYOZ8kBn6vbbjf2NcLe34uK2+tSE6gaueDz6KugqoqT1HrZYTNCD?=
 =?us-ascii?Q?YzkUO1fPUHkOHyzPfGkq+zEwgNJyP78r8CYudQ0qcL0FPcL/ngqgVFQr9DFn?=
 =?us-ascii?Q?oTrWag3ZHhIejp34kOqyqnScjgc3SYRWsu14lBhdetYy306DyrMlGeLLi1df?=
 =?us-ascii?Q?a8erXL5r54y5MMkNW37i8vO0ixev7AT6B17tXXBVw7sLp4BWItBg8GGbdHpx?=
 =?us-ascii?Q?bucukj8fresPtV8CjbJ/S21y5MQIaUP0SOK8Aurlmrw/cSRQADeQgLA3+Skp?=
 =?us-ascii?Q?QqufH2CPuafRj4zkFOEoIXwb/aCiyqnfoVphcxnUr52JEL1D3DYrhu6DIiE3?=
 =?us-ascii?Q?bJVvoe0ZCoLwSgVDSiijxQkCJ/VT9ZNrDl3jWc9ox8cI2yek7qKuJARbiBAa?=
 =?us-ascii?Q?8WG2FRTwy8COyvm4O9fd58L894g33qkma19kmBwfuoI+HwhmjH3c3+G/cXoo?=
 =?us-ascii?Q?l3fSjBmEWEEwdldM5BGO6d/iRQl1CnVA6ShQETF4EsACmcxxQkpnn78stCbG?=
 =?us-ascii?Q?ID4K8J6ZBDAS4bKa8RCI+eyOIo/Gf1KTLtYNbWBTzVGpcAmtz9peyvKUj7E1?=
 =?us-ascii?Q?BCVzE+2xlS7LVRi6alpoltD/NJ98mqBeOGKItVDh3eNPEtNnRNL77V5sng/N?=
 =?us-ascii?Q?AtKuBr8GjKSHBj8chV1Sjaa5bX8kRrc5O+gKZ+UFmxtHjI+oGt5/uC4xaObX?=
 =?us-ascii?Q?sDymegD1rtgXpuwpIBaSVNfjlhxDH4wFlYIlFXg/dRxvaxbpIl568ao1fHSs?=
 =?us-ascii?Q?SWso+RA2NfmyCpuKqmR97yN8yAAtjjem8EauN4vqrMab+ZTNb7AwdhQ+mpMO?=
 =?us-ascii?Q?N8HYG5pG+5U75CMNChFE80yEx05p5SbOu/z/6halwGmu9vur5vKhTBaOBTex?=
 =?us-ascii?Q?YCMJB4J2J5OCnc7txWuSUJ5FhKH79pLM10/29vgekSzVMY7PaJKiwrNRJe6S?=
 =?us-ascii?Q?kBUJzLjWYTkUOH8Wj8puiUOupCgYedDkG+AUzP420Y9dTu4pHLLS2U6Df/pa?=
 =?us-ascii?Q?PsaOKPr2n0hc1cFoadqdQkZp+BYALO9jaGFyxgH/Wb7C0cedzfMfDdbyObc5?=
 =?us-ascii?Q?VGmG5dM5rSeeoJCGwX9jUCbPLlRpbw3r+xxITk61?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b88627e4-a901-41de-49e6-08db285c1ec0
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:12.2639
 (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: YY4SLmt5Nn1EF6M2J2KmGbdU2eL8QGPabrAGWupoO+ITX7pempAPu+bAN81NB/wD5Ht3mUELYv1rDCPka/87lg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4012
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>
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/erofs/sysfs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/erofs/sysfs.c b/fs/erofs/sysfs.c
index 435e515c0792..9ed7d6552155 100644
--- a/fs/erofs/sysfs.c
+++ b/fs/erofs/sysfs.c
@@ -241,8 +241,7 @@ void erofs_unregister_sysfs(struct super_block *sb)
 	struct erofs_sb_info *sbi = EROFS_SB(sb);
 
 	if (sbi->s_kobj.state_in_sysfs) {
-		kobject_del(&sbi->s_kobj);
-		kobject_put(&sbi->s_kobj);
+		kobject_del_and_put(&sbi->s_kobj);
 		wait_for_completion(&sbi->s_kobj_unregister);
 	}
 }
-- 
2.35.1