From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423342AbcIZQeF (ORCPT ); Mon, 26 Sep 2016 12:34:05 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48458 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422915AbcIZQeC (ORCPT ); Mon, 26 Sep 2016 12:34:02 -0400 Date: Mon, 26 Sep 2016 09:32:03 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, bp@suse.de, hpa@zytor.com, tglx@linutronix.de, peterz@infradead.org Reply-To: peterz@infradead.org, tglx@linutronix.de, hpa@zytor.com, bp@suse.de, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, mingo@kernel.org In-Reply-To: <20160926083152.30848-3-bp@alien8.de> References: <20160926083152.30848-3-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/RAS/mce_amd_inj: Remove debugfs dir recursively on exit Git-Commit-ID: b199ac6c4943aa0db246163bf6b483e2bb53431b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b199ac6c4943aa0db246163bf6b483e2bb53431b Gitweb: http://git.kernel.org/tip/b199ac6c4943aa0db246163bf6b483e2bb53431b Author: Borislav Petkov AuthorDate: Mon, 26 Sep 2016 10:31:52 +0200 Committer: Ingo Molnar CommitDate: Mon, 26 Sep 2016 11:13:17 +0200 x86/RAS/mce_amd_inj: Remove debugfs dir recursively on exit Simplify exit_mce_inject() by using debugfs_remove_recursive() and do away with the noodling over the dentry elements. Signed-off-by: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20160926083152.30848-3-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/ras/mce_amd_inj.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/x86/ras/mce_amd_inj.c b/arch/x86/ras/mce_amd_inj.c index 20b227f..1ac7647 100644 --- a/arch/x86/ras/mce_amd_inj.c +++ b/arch/x86/ras/mce_amd_inj.c @@ -475,15 +475,11 @@ err_dfs_add: static void __exit exit_mce_inject(void) { - int i; - for (i = 0; i < ARRAY_SIZE(dfs_fls); i++) - debugfs_remove(dfs_fls[i].d); + debugfs_remove_recursive(dfs_inj); + dfs_inj = NULL; memset(&dfs_fls, 0, sizeof(dfs_fls)); - - debugfs_remove(dfs_inj); - dfs_inj = NULL; } module_init(init_mce_inject); module_exit(exit_mce_inject);