Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PM: domains: use dev_err_probe() to simplify error handling

dev_err_probe() can reduce code size, makes the code easier to read
and has the added benefit of recording the defer reason for later
read out. Use it where appropriate.

This also fixes an issue, where an error message in __genpd_dev_pm_attach
was not terminated by a line break.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Ahmad Fatoum and committed by
Rafael J. Wysocki
9a6582b8 e7d90cfa

+6 -15
+6 -15
drivers/base/power/domain.c
··· 2267 2267 /* Parse genpd OPP table */ 2268 2268 if (genpd->set_performance_state) { 2269 2269 ret = dev_pm_opp_of_add_table(&genpd->dev); 2270 - if (ret) { 2271 - if (ret != -EPROBE_DEFER) 2272 - dev_err(&genpd->dev, "Failed to add OPP table: %d\n", 2273 - ret); 2274 - return ret; 2275 - } 2270 + if (ret) 2271 + return dev_err_probe(&genpd->dev, ret, "Failed to add OPP table\n"); 2276 2272 2277 2273 /* 2278 2274 * Save table for faster processing while setting performance ··· 2327 2331 if (genpd->set_performance_state) { 2328 2332 ret = dev_pm_opp_of_add_table_indexed(&genpd->dev, i); 2329 2333 if (ret) { 2330 - if (ret != -EPROBE_DEFER) 2331 - dev_err(&genpd->dev, "Failed to add OPP table for index %d: %d\n", 2332 - i, ret); 2334 + dev_err_probe(&genpd->dev, ret, 2335 + "Failed to add OPP table for index %d\n", i); 2333 2336 goto error; 2334 2337 } 2335 2338 ··· 2686 2691 ret = genpd_add_device(pd, dev, base_dev); 2687 2692 mutex_unlock(&gpd_list_lock); 2688 2693 2689 - if (ret < 0) { 2690 - if (ret != -EPROBE_DEFER) 2691 - dev_err(dev, "failed to add to PM domain %s: %d", 2692 - pd->name, ret); 2693 - return ret; 2694 - } 2694 + if (ret < 0) 2695 + return dev_err_probe(dev, ret, "failed to add to PM domain %s\n", pd->name); 2695 2696 2696 2697 dev->pm_domain->detach = genpd_dev_pm_detach; 2697 2698 dev->pm_domain->sync = genpd_dev_pm_sync;