1
0
Fork 0

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>
wifi-calibration
Axel Lin 2011-11-15 21:59:09 +01:00 committed by Rafael J. Wysocki
parent bb58dd5d1f
commit 3f19f08a7e
1 changed files with 7 additions and 8 deletions

View File

@ -347,7 +347,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
if (!IS_ERR(devfreq)) { if (!IS_ERR(devfreq)) {
dev_err(dev, "%s: Unable to create devfreq for the device. It already has one.\n", __func__); dev_err(dev, "%s: Unable to create devfreq for the device. It already has one.\n", __func__);
err = -EINVAL; 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", dev_err(dev, "%s: Unable to create devfreq for the device\n",
__func__); __func__);
err = -ENOMEM; err = -ENOMEM;
goto out; goto err_out;
} }
mutex_init(&devfreq->lock); mutex_init(&devfreq->lock);
@ -399,17 +399,16 @@ struct devfreq *devfreq_add_device(struct device *dev,
devfreq->next_polling); devfreq->next_polling);
} }
mutex_unlock(&devfreq_list_lock); mutex_unlock(&devfreq_list_lock);
goto out; out:
return devfreq;
err_init: err_init:
device_unregister(&devfreq->dev); device_unregister(&devfreq->dev);
err_dev: err_dev:
mutex_unlock(&devfreq->lock); mutex_unlock(&devfreq->lock);
kfree(devfreq); kfree(devfreq);
out: err_out:
if (err) return ERR_PTR(err);
return ERR_PTR(err);
else
return devfreq;
} }
/** /**