mirror of
https://github.com/torvalds/linux.git
synced 2026-07-28 18:21:24 +02:00
pmdomain: core: switch to dynamic root device
Driver core expects devices to be dynamically allocated and will, for example, complain loudly if a device that lacks a release function is ever freed. Use root_device_register() to allocate and register the root device instead of open coding using a static device. Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Ulf Hansson <ulfh@kernel.org>
This commit is contained in:
parent
bb85d843e3
commit
a96e40f4af
|
|
@ -33,9 +33,7 @@ static const struct bus_type genpd_provider_bus_type = {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* The parent for genpd_provider devices. */
|
/* The parent for genpd_provider devices. */
|
||||||
static struct device genpd_provider_bus = {
|
static struct device *genpd_provider_bus;
|
||||||
.init_name = "genpd_provider",
|
|
||||||
};
|
|
||||||
|
|
||||||
#define GENPD_RETRY_MAX_MS 250 /* Approximate */
|
#define GENPD_RETRY_MAX_MS 250 /* Approximate */
|
||||||
|
|
||||||
|
|
@ -2325,7 +2323,7 @@ static int genpd_alloc_data(struct generic_pm_domain *genpd)
|
||||||
device_initialize(&genpd->dev);
|
device_initialize(&genpd->dev);
|
||||||
genpd->dev.release = genpd_provider_release;
|
genpd->dev.release = genpd_provider_release;
|
||||||
genpd->dev.bus = &genpd_provider_bus_type;
|
genpd->dev.bus = &genpd_provider_bus_type;
|
||||||
genpd->dev.parent = &genpd_provider_bus;
|
genpd->dev.parent = genpd_provider_bus;
|
||||||
|
|
||||||
if (!genpd_is_dev_name_fw(genpd)) {
|
if (!genpd_is_dev_name_fw(genpd)) {
|
||||||
dev_set_name(&genpd->dev, "%s", genpd->name);
|
dev_set_name(&genpd->dev, "%s", genpd->name);
|
||||||
|
|
@ -3742,11 +3740,9 @@ static int __init genpd_bus_init(void)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = device_register(&genpd_provider_bus);
|
genpd_provider_bus = root_device_register("genpd_provider");
|
||||||
if (ret) {
|
if (IS_ERR(genpd_provider_bus))
|
||||||
put_device(&genpd_provider_bus);
|
return PTR_ERR(genpd_provider_bus);
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = bus_register(&genpd_provider_bus_type);
|
ret = bus_register(&genpd_provider_bus_type);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
@ -3768,7 +3764,7 @@ static int __init genpd_bus_init(void)
|
||||||
err_prov_bus:
|
err_prov_bus:
|
||||||
bus_unregister(&genpd_provider_bus_type);
|
bus_unregister(&genpd_provider_bus_type);
|
||||||
err_dev:
|
err_dev:
|
||||||
device_unregister(&genpd_provider_bus);
|
root_device_unregister(genpd_provider_bus);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
core_initcall(genpd_bus_init);
|
core_initcall(genpd_bus_init);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user