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>,
        linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2, RESEND 05/10] ubifs: convert to kobject_del_and_put()
Date:   Sun, 19 Mar 2023 17:26:36 +0800
Message-Id: <20230319092641.41917-5-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?JQtibGmkmXbQCspkRsW9cV0Q96IytN1Thit9mI0LcBzRPfIYpAZ/r+Wiv1cE?=
 =?us-ascii?Q?1pRfUR2ECU/2rN9qcbLR6vs3i+Z2QHM2HhXBnVpJKuEZpJANiTaOsj1lXB7s?=
 =?us-ascii?Q?LRF54u51NFjdb0gUcw8DDGEsbqgXKnjg38zePp/nzE1VfPxm+kwpT2bw1uQJ?=
 =?us-ascii?Q?aJxBBCn0WIU8EHDnpoDdsIxnZliIvRdqVAiNL2j0Xk81oieZI7pOcS/WyGbJ?=
 =?us-ascii?Q?BOdsRcHgCdbnrCMz8A2dGteVqkHiNlOLGq1dac5JzLMAHTBBl+M9oZaSVdJi?=
 =?us-ascii?Q?z/HKLphLIY9ZBbfKqhszmEHmUhaS2gDhH1uhNFdVHDFoumyfHWnpprVSLD0+?=
 =?us-ascii?Q?fTi4X6ChyTI06E8iih0GC5PxBt+tuvhsD6qVJ3HBiPNOi4FEYy79boSfGUc/?=
 =?us-ascii?Q?fLhkpaDyvBHpxv2WH8cx9VzvCCJkVAb8mlBaId8qE9QiAv/QC9VXp0LcQwIb?=
 =?us-ascii?Q?MbvL9QetgRaw1OMdTiPZcHCkbSawT+Rsiaeis37Fe9T2QpF+cyeLACDnU72d?=
 =?us-ascii?Q?2zZpDWsNb9PEo4ukZaqTAFb+rcfluXPiP/wnpIL6NW9Wh9hjvtJlrHtUJQF+?=
 =?us-ascii?Q?ZItM3bm2/MjCGyIfb4Sbi23G8Up0leK6a05DDb157fQR4WSQDtURNJFGfVnw?=
 =?us-ascii?Q?goihDT+mxXxh47rHsx/Nx7dC7fjAOA5D58FtU8jI75BcDbPfW3rNGNlJtBce?=
 =?us-ascii?Q?l3s9mFRsGMTAwRrZr440pQOO0G8gQTpli0miwRgHJJvG4lH+Kx6qnpNMMoV9?=
 =?us-ascii?Q?Q3vE7n9dGoIAqm5lmIjjGPQVuwhvCUVcps6pHy+umh/7fum82/AKqx3Ra5WA?=
 =?us-ascii?Q?y40Iiv1qyBJSqKl3uEYbWl/0Cof3ssWGnISOLUICouHNGTdhIN63AXd3nU0K?=
 =?us-ascii?Q?3qITRNRrBj214/y/dVZQdhPQmC5JRkHxIZ1Or55thC18vecQ2H2UnTCjKRNs?=
 =?us-ascii?Q?aUxCsUl5P5jAA8FVRCUifjoIHvVi+i7tUie1VffGj+p9HXTQDGj1Tg0ziBuW?=
 =?us-ascii?Q?z+p13BK4ThwdXkuexnrq7/b5rXbCejjyYx0EWo6q0rck7AEFpLA/t5nnU6Xp?=
 =?us-ascii?Q?cnJN9aUtUJSW+b9YIDOUkfEOyaSAUFLTMKD8Oa7lGRBKeG1+c+4mZyfkGXUr?=
 =?us-ascii?Q?llJ0b09eNMzqyod+DJAGmY4i9XnG6rDiMyL8YFY6Gr8zg+1glAeSRNUNRN39?=
 =?us-ascii?Q?MttTnVXo8F+LSLmToezKlsBaHYSyf/1Yu4paAHU4x2IYgQDvk818RFmBstYh?=
 =?us-ascii?Q?rRc8DzW8noWRPsJiYG0WzfOvuO9DkUM8raA2BozO+tt16MeCvAbBrZz579lJ?=
 =?us-ascii?Q?DlMVVeu5MLOwdCng2NXQc+AiHVBrtfkwtT2lh/TakwTTuQ/J/fuV7q2L0Q38?=
 =?us-ascii?Q?6ScaA4rD4cYUwC1HhtkbKr5txho7yxIf3jZELTVhm7GZWta2IAo3zHkJArl5?=
 =?us-ascii?Q?JqYlrl0MBKfy9KrN/np0+1DZILRlNH2MdZPUS4nhFF3/0Lh5KQLgQ5BUrCzh?=
 =?us-ascii?Q?zxVBJ1MLhJJWsVUyoDrQ5dqbsZmhPC8kV/Zpo5XhCvZ1/+GngPXYHXQFQeOT?=
 =?us-ascii?Q?cS8j/5XjEcwGntLvF1HIDjG7gguAfOGd2ENGgtzQ?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f9432d6c-79d8-4513-333b-08db285c217b
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:16.8600
 (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: uE/RNphEW4t6fm5DlEAThO5s5R+nZ/ssWiLQrrXYn+yvcqdjDMIrE1A+6ZxUEpxnVtG4K2DgRygXH7Fh1rw/ug==
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/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