mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 01:02:08 +00:00
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
This commit is contained in:
commit
f58ac513a4
@ -2142,6 +2142,11 @@ static int genpd_set_default_power_state(struct generic_pm_domain *genpd)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void genpd_provider_release(struct device *dev)
|
||||
{
|
||||
/* nothing to be done here */
|
||||
}
|
||||
|
||||
static int genpd_alloc_data(struct generic_pm_domain *genpd)
|
||||
{
|
||||
struct genpd_governor_data *gd = NULL;
|
||||
@ -2173,6 +2178,7 @@ static int genpd_alloc_data(struct generic_pm_domain *genpd)
|
||||
|
||||
genpd->gd = gd;
|
||||
device_initialize(&genpd->dev);
|
||||
genpd->dev.release = genpd_provider_release;
|
||||
|
||||
if (!genpd_is_dev_name_fw(genpd)) {
|
||||
dev_set_name(&genpd->dev, "%s", genpd->name);
|
||||
|
@ -1458,12 +1458,12 @@ static int imx_gpcv2_probe(struct platform_device *pdev)
|
||||
.max_register = SZ_4K,
|
||||
};
|
||||
struct device *dev = &pdev->dev;
|
||||
struct device_node *pgc_np;
|
||||
struct device_node *pgc_np __free(device_node) =
|
||||
of_get_child_by_name(dev->of_node, "pgc");
|
||||
struct regmap *regmap;
|
||||
void __iomem *base;
|
||||
int ret;
|
||||
|
||||
pgc_np = of_get_child_by_name(dev->of_node, "pgc");
|
||||
if (!pgc_np) {
|
||||
dev_err(dev, "No power domains specified in DT\n");
|
||||
return -EINVAL;
|
||||
|
Loading…
Reference in New Issue
Block a user