PM / devfreq: exynos-bus: Reduce goto statements and remove unused headers
Improve code readability by changing the goto statements as well as eliminating a few more goto statements (related to return paths). Moreover, remove unused header file and adds a missing <linux/of.h>. Signed-off-by: Artur Świgoń <a.swigon@samsung.com> [cw00.choi: Edit patch title and description] Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
This commit is contained in:
parent
eff5d31f74
commit
a440892142
|
@ -15,11 +15,10 @@
|
|||
#include <linux/device.h>
|
||||
#include <linux/export.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/pm_opp.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/regulator/consumer.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
#define DEFAULT_SATURATION_RATIO 40
|
||||
|
||||
|
@ -301,10 +300,9 @@ static int exynos_bus_profile_init(struct exynos_bus *bus,
|
|||
profile->exit = exynos_bus_exit;
|
||||
|
||||
ondemand_data = devm_kzalloc(dev, sizeof(*ondemand_data), GFP_KERNEL);
|
||||
if (!ondemand_data) {
|
||||
ret = -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
if (!ondemand_data)
|
||||
return -ENOMEM;
|
||||
|
||||
ondemand_data->upthreshold = 40;
|
||||
ondemand_data->downdifferential = 5;
|
||||
|
||||
|
@ -314,15 +312,14 @@ static int exynos_bus_profile_init(struct exynos_bus *bus,
|
|||
ondemand_data);
|
||||
if (IS_ERR(bus->devfreq)) {
|
||||
dev_err(dev, "failed to add devfreq device\n");
|
||||
ret = PTR_ERR(bus->devfreq);
|
||||
goto err;
|
||||
return PTR_ERR(bus->devfreq);
|
||||
}
|
||||
|
||||
/* Register opp_notifier to catch the change of OPP */
|
||||
ret = devm_devfreq_register_opp_notifier(dev, bus->devfreq);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "failed to register opp notifier\n");
|
||||
goto err;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -332,17 +329,16 @@ static int exynos_bus_profile_init(struct exynos_bus *bus,
|
|||
ret = exynos_bus_enable_edev(bus);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "failed to enable devfreq-event devices\n");
|
||||
goto err;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = exynos_bus_set_event(bus);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "failed to set event to devfreq-event devices\n");
|
||||
goto err;
|
||||
return ret;
|
||||
}
|
||||
|
||||
err:
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int exynos_bus_profile_init_passive(struct exynos_bus *bus,
|
||||
|
@ -351,7 +347,6 @@ static int exynos_bus_profile_init_passive(struct exynos_bus *bus,
|
|||
struct device *dev = bus->dev;
|
||||
struct devfreq_passive_data *passive_data;
|
||||
struct devfreq *parent_devfreq;
|
||||
int ret = 0;
|
||||
|
||||
/* Initialize the struct profile and governor data for passive device */
|
||||
profile->target = exynos_bus_target;
|
||||
|
@ -359,16 +354,13 @@ static int exynos_bus_profile_init_passive(struct exynos_bus *bus,
|
|||
|
||||
/* Get the instance of parent devfreq device */
|
||||
parent_devfreq = devfreq_get_devfreq_by_phandle(dev, 0);
|
||||
if (IS_ERR(parent_devfreq)) {
|
||||
ret = -EPROBE_DEFER;
|
||||
goto err;
|
||||
}
|
||||
if (IS_ERR(parent_devfreq))
|
||||
return -EPROBE_DEFER;
|
||||
|
||||
passive_data = devm_kzalloc(dev, sizeof(*passive_data), GFP_KERNEL);
|
||||
if (!passive_data) {
|
||||
ret = -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
if (!passive_data)
|
||||
return -ENOMEM;
|
||||
|
||||
passive_data->parent = parent_devfreq;
|
||||
|
||||
/* Add devfreq device for exynos bus with passive governor */
|
||||
|
@ -377,12 +369,10 @@ static int exynos_bus_profile_init_passive(struct exynos_bus *bus,
|
|||
if (IS_ERR(bus->devfreq)) {
|
||||
dev_err(dev,
|
||||
"failed to add devfreq dev with passive governor\n");
|
||||
ret = PTR_ERR(bus->devfreq);
|
||||
goto err;
|
||||
return PTR_ERR(bus->devfreq);
|
||||
}
|
||||
|
||||
err:
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int exynos_bus_probe(struct platform_device *pdev)
|
||||
|
@ -427,19 +417,13 @@ static int exynos_bus_probe(struct platform_device *pdev)
|
|||
goto err_reg;
|
||||
|
||||
if (passive)
|
||||
goto passive;
|
||||
ret = exynos_bus_profile_init_passive(bus, profile);
|
||||
else
|
||||
ret = exynos_bus_profile_init(bus, profile);
|
||||
|
||||
ret = exynos_bus_profile_init(bus, profile);
|
||||
if (ret < 0)
|
||||
goto err;
|
||||
|
||||
goto out;
|
||||
passive:
|
||||
ret = exynos_bus_profile_init_passive(bus, profile);
|
||||
if (ret < 0)
|
||||
goto err;
|
||||
|
||||
out:
|
||||
max_state = bus->devfreq->profile->max_state;
|
||||
min_freq = (bus->devfreq->profile->freq_table[0] / 1000);
|
||||
max_freq = (bus->devfreq->profile->freq_table[max_state - 1] / 1000);
|
||||
|
|
Loading…
Reference in a new issue