@@ -8403,8 +8403,8 @@ index 9b502e8751d18c..0f065748f9ec07 100644
84038403 { },
84048404 };
84058405
8406- -static const char *exynos_get_domain_name(struct device_node *node)
8407- +static const char *exynos_get_domain_name(struct device *dev,
8406+ -static __init const char *exynos_get_domain_name(struct device_node *node)
8407+ +static __init const char *exynos_get_domain_name(struct device *dev,
84088408+ struct device_node *node)
84098409 {
84108410 const char *name;
@@ -8416,24 +8416,15 @@ index 9b502e8751d18c..0f065748f9ec07 100644
84168416 }
84178417
84188418 static int exynos_pd_probe(struct platform_device *pdev)
8419- @@ -115,15 +116,13 @@ static int exynos_pd_probe(struct platform_device *pdev)
8420- if (!pd)
8421- return -ENOMEM;
8422-
8423- - pd->pd.name = exynos_get_domain_name(np);
8424- + pd->pd.name = exynos_get_domain_name(dev, np);
8425- if (!pd->pd.name)
8426- return -ENOMEM;
8427-
8428- pd->base = of_iomap(np, 0);
8429- - if (!pd->base) {
8430- - kfree_const(pd->pd.name);
8431- + if (!pd->base)
8432- return -ENODEV;
8433- - }
8434-
8435- pd->pd.power_off = exynos_pd_power_off;
8436- pd->pd.power_on = exynos_pd_power_on;
8419+ @@ -120,7 +121,7 @@ static __init int exynos4_pm_init_power_domain(void)
8420+ of_node_put(np);
8421+ return -ENOMEM;
8422+ }
8423+ - pd->pd.name = exynos_get_domain_name(np);
8424+ + pd->pd.name = exynos_get_domain_name(dev, np);
8425+ if (!pd->pd.name) {
8426+ kfree(pd);
8427+ of_node_put(np);
84378428diff --git a/drivers/power/supply/qcom_battmgr.c b/drivers/power/supply/qcom_battmgr.c
84388429index 190e8a4cfa97f4..0c993780d3ef29 100644
84398430--- a/drivers/power/supply/qcom_battmgr.c
0 commit comments