Message ID | 20180213195327.GA10678@us.ibm.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 45ddea8a73a25461387eb8e87f3e0ecca084799b |
Headers | show |
Series | Fix cleanup when VAS is not configured | expand |
On Tue, 2018-02-13 at 19:53:27 UTC, Sukadev Bhattiprolu wrote: > From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> > Date: Fri, 9 Feb 2018 11:49:06 -0600 > Subject: [PATCH 1/1] powerpc/vas: Fix cleanup when VAS is not configured > > When VAS is not configured, unregister the platform driver. Also simplify > cleanup by delaying vas debugfs init until we know VAS is configured. > > Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/45ddea8a73a25461387eb8e87f3e0e cheers
diff --git a/arch/powerpc/platforms/powernv/vas-debug.c b/arch/powerpc/platforms/powernv/vas-debug.c index b4de4c6..4f7276e 100644 --- a/arch/powerpc/platforms/powernv/vas-debug.c +++ b/arch/powerpc/platforms/powernv/vas-debug.c @@ -179,6 +179,7 @@ void vas_instance_init_dbgdir(struct vas_instance *vinst) { struct dentry *d; + vas_init_dbgdir(); if (!vas_debugfs) return; @@ -201,8 +202,18 @@ void vas_instance_init_dbgdir(struct vas_instance *vinst) vinst->dbgdir = NULL; } +/* + * Set up the "root" VAS debugfs dir. Return if we already set it up + * (or failed to) in an earlier instance of VAS. + */ void vas_init_dbgdir(void) { + static bool first_time = true; + + if (!first_time) + return; + + first_time = false; vas_debugfs = debugfs_create_dir("vas", NULL); if (IS_ERR(vas_debugfs)) vas_debugfs = NULL; diff --git a/arch/powerpc/platforms/powernv/vas.c b/arch/powerpc/platforms/powernv/vas.c index aebbe95..5a2b24c 100644 --- a/arch/powerpc/platforms/powernv/vas.c +++ b/arch/powerpc/platforms/powernv/vas.c @@ -160,8 +160,6 @@ static int __init vas_init(void) int found = 0; struct device_node *dn; - vas_init_dbgdir(); - platform_driver_register(&vas_driver); for_each_compatible_node(dn, NULL, "ibm,vas") { @@ -169,8 +167,10 @@ static int __init vas_init(void) found++; } - if (!found) + if (!found) { + platform_driver_unregister(&vas_driver); return -ENODEV; + } pr_devel("Found %d instances\n", found);