Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux-2.6-block.git] / drivers / base / power / domain.c

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 84662d33818803017a251921fd3aae685e7e30d9..32084e38b73d01f58ae1a5a9f5beb759e1328a88 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -220,13 +220,10 @@ static void genpd_debug_add(struct generic_pm_domain *genpd);
 
 static void genpd_debug_remove(struct generic_pm_domain *genpd)
 {
-       struct dentry *d;
-
        if (!genpd_debugfs_dir)
                return;
 
-       d = debugfs_lookup(genpd->name, genpd_debugfs_dir);
-       debugfs_remove(d);
+       debugfs_lookup_and_remove(genpd->name, genpd_debugfs_dir);
 }
 
 static void genpd_update_accounting(struct generic_pm_domain *genpd)