diff options
| -rw-r--r-- | drivers/regulator/dbx500-prcmu.c | 24 | 
1 files changed, 5 insertions, 19 deletions
| diff --git a/drivers/regulator/dbx500-prcmu.c b/drivers/regulator/dbx500-prcmu.c index c3ad6aa6b5d3..7395ad2105ab 100644 --- a/drivers/regulator/dbx500-prcmu.c +++ b/drivers/regulator/dbx500-prcmu.c @@ -67,8 +67,6 @@ static int power_state_active_get(void)  static struct ux500_regulator_debug {  	struct dentry *dir; -	struct dentry *status_file; -	struct dentry *power_state_cnt_file;  	struct dbx500_regulator_info *regulator_array;  	int num_regulators;  	u8 *state_before_suspend; @@ -117,22 +115,14 @@ ux500_regulator_debug_init(struct platform_device *pdev,  {  	/* create directory */  	rdebug.dir = debugfs_create_dir("ux500-regulator", NULL); -	if (!rdebug.dir) -		goto exit_no_debugfs;  	/* create "status" file */ -	rdebug.status_file = debugfs_create_file("status", -		S_IRUGO, rdebug.dir, &pdev->dev, -		&ux500_regulator_status_fops); -	if (!rdebug.status_file) -		goto exit_destroy_dir; +	debugfs_create_file("status", S_IRUGO, rdebug.dir, &pdev->dev, +			    &ux500_regulator_status_fops);  	/* create "power-state-count" file */ -	rdebug.power_state_cnt_file = debugfs_create_file("power-state-count", -		S_IRUGO, rdebug.dir, &pdev->dev, -		&ux500_regulator_power_state_cnt_fops); -	if (!rdebug.power_state_cnt_file) -		goto exit_destroy_status; +	debugfs_create_file("power-state-count", S_IRUGO, rdebug.dir, +			    &pdev->dev, &ux500_regulator_power_state_cnt_fops);  	rdebug.regulator_array = regulator_info;  	rdebug.num_regulators = num_regulators; @@ -150,11 +140,7 @@ ux500_regulator_debug_init(struct platform_device *pdev,  exit_free:  	kfree(rdebug.state_before_suspend);  exit_destroy_power_state: -	debugfs_remove(rdebug.power_state_cnt_file); -exit_destroy_status: -	debugfs_remove(rdebug.status_file); -exit_destroy_dir: -	debugfs_remove(rdebug.dir); +	debugfs_remove_recursive(rdebug.dir);  exit_no_debugfs:  	dev_err(&pdev->dev, "failed to create debugfs entries.\n");  	return -ENOMEM; | 
