summaryrefslogtreecommitdiffstats
path: root/drivers/devfreq
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-11-15 21:59:09 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2011-11-23 21:05:55 +0100
commit3f19f08a7ec74cfc50fbad3c5e615760afbd23a0 (patch)
tree2d0bf56045dab430325dd6df59f0c135f00daf55 /drivers/devfreq
parentbb58dd5d1ffad6c2d21c69698ba766dad4ae54e6 (diff)
downloadlinux-stable-3f19f08a7ec74cfc50fbad3c5e615760afbd23a0.tar.gz
linux-stable-3f19f08a7ec74cfc50fbad3c5e615760afbd23a0.tar.bz2
linux-stable-3f19f08a7ec74cfc50fbad3c5e615760afbd23a0.zip
PM / devfreq: separate error paths from successful path
I think this change improves code readability. Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/devfreq')
-rw-r--r--drivers/devfreq/devfreq.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 59d24e9cb8c5..c189b82f5ece 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -347,7 +347,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
if (!IS_ERR(devfreq)) {
dev_err(dev, "%s: Unable to create devfreq for the device. It already has one.\n", __func__);
err = -EINVAL;
- goto out;
+ goto err_out;
}
}
@@ -356,7 +356,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
dev_err(dev, "%s: Unable to create devfreq for the device\n",
__func__);
err = -ENOMEM;
- goto out;
+ goto err_out;
}
mutex_init(&devfreq->lock);
@@ -399,17 +399,16 @@ struct devfreq *devfreq_add_device(struct device *dev,
devfreq->next_polling);
}
mutex_unlock(&devfreq_list_lock);
- goto out;
+out:
+ return devfreq;
+
err_init:
device_unregister(&devfreq->dev);
err_dev:
mutex_unlock(&devfreq->lock);
kfree(devfreq);
-out:
- if (err)
- return ERR_PTR(err);
- else
- return devfreq;
+err_out:
+ return ERR_PTR(err);
}
/**