| Message ID | 20191222174132.3701-1-tiny.windzz@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Chanwoo Choi |
| Headers | show |
| Series | [v2,1/2] PM / devfreq: rk3399_dmc: Disable devfreq-event device when fails | expand |
On 12/23/19 2:41 AM, Yangtao Li wrote: > The probe process may fail, but the devfreq event device remains > enabled. Call devfreq_event_disable_edev on the error return path. > > Signed-off-by: Yangtao Li <tiny.windzz@gmail.com> > --- > v2: > -change subject > -rename lable to err_edev > -fix error path handler > --- > drivers/devfreq/rk3399_dmc.c | 17 ++++++++++++----- > 1 file changed, 12 insertions(+), 5 deletions(-) > > > diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c > index 2f1027c5b647..4288745304c7 100644 > --- a/drivers/devfreq/rk3399_dmc.c > +++ b/drivers/devfreq/rk3399_dmc.c > @@ -364,7 +364,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) > if (res.a0) { > dev_err(dev, "Failed to set dram param: %ld\n", > res.a0); > - return -EINVAL; > + ret = -EINVAL; > + goto err_edev; > } > } > } > @@ -373,8 +374,10 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) > if (node) { > data->regmap_pmu = syscon_node_to_regmap(node); > of_node_put(node); > - if (IS_ERR(data->regmap_pmu)) > - return PTR_ERR(data->regmap_pmu); > + if (IS_ERR(data->regmap_pmu)) { > + ret = PTR_ERR(data->regmap_pmu); > + goto err_edev; > + } > } > > regmap_read(data->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val); > @@ -392,7 +395,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) > data->odt_dis_freq = data->timing.lpddr4_odt_dis_freq; > break; > default: > - return -EINVAL; > + ret = -EINVAL; > + goto err_edev; > }; > > arm_smccc_smc(ROCKCHIP_SIP_DRAM_FREQ, 0, 0, > @@ -426,7 +430,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) > */ > if (dev_pm_opp_of_add_table(dev)) { > dev_err(dev, "Invalid operating-points in device tree.\n"); > - return -EINVAL; > + ret = -EINVAL; > + goto err_edev; > } > > of_property_read_u32(np, "upthreshold", > @@ -466,6 +471,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) > > err_free_opp: > dev_pm_opp_of_remove_table(&pdev->dev); > +err_edev: > + devfreq_event_disable_edev(data->edev); > return ret; > } > > Applied it.
diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c index 2f1027c5b647..4288745304c7 100644 --- a/drivers/devfreq/rk3399_dmc.c +++ b/drivers/devfreq/rk3399_dmc.c @@ -364,7 +364,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) if (res.a0) { dev_err(dev, "Failed to set dram param: %ld\n", res.a0); - return -EINVAL; + ret = -EINVAL; + goto err_edev; } } } @@ -373,8 +374,10 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) if (node) { data->regmap_pmu = syscon_node_to_regmap(node); of_node_put(node); - if (IS_ERR(data->regmap_pmu)) - return PTR_ERR(data->regmap_pmu); + if (IS_ERR(data->regmap_pmu)) { + ret = PTR_ERR(data->regmap_pmu); + goto err_edev; + } } regmap_read(data->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val); @@ -392,7 +395,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) data->odt_dis_freq = data->timing.lpddr4_odt_dis_freq; break; default: - return -EINVAL; + ret = -EINVAL; + goto err_edev; }; arm_smccc_smc(ROCKCHIP_SIP_DRAM_FREQ, 0, 0, @@ -426,7 +430,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) */ if (dev_pm_opp_of_add_table(dev)) { dev_err(dev, "Invalid operating-points in device tree.\n"); - return -EINVAL; + ret = -EINVAL; + goto err_edev; } of_property_read_u32(np, "upthreshold", @@ -466,6 +471,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) err_free_opp: dev_pm_opp_of_remove_table(&pdev->dev); +err_edev: + devfreq_event_disable_edev(data->edev); return ret; }
The probe process may fail, but the devfreq event device remains enabled. Call devfreq_event_disable_edev on the error return path. Signed-off-by: Yangtao Li <tiny.windzz@gmail.com> --- v2: -change subject -rename lable to err_edev -fix error path handler --- drivers/devfreq/rk3399_dmc.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)