Merge tag 'smp-core-2023-04-27' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / arch / powerpc / platforms / powernv / subcore.c

diff --git a/arch/powerpc/platforms/powernv/subcore.c b/arch/powerpc/platforms/powernv/subcore.c
index c53c4c79776801aebddc3ea1a87234f4cbb6fd9f..191424468f10aaf1e57eef7d4bf3d4361776d7e4 100644 (file)
--- a/arch/powerpc/platforms/powernv/subcore.c
+++ b/arch/powerpc/platforms/powernv/subcore.c
@@ -417,7 +417,9 @@ static DEVICE_ATTR(subcores_per_core, 0644,
 
 static int subcore_init(void)
 {
+       struct device *dev_root;
        unsigned pvr_ver;
+       int rc = 0;
 
        pvr_ver = PVR_VER(mfspr(SPRN_PVR));
 
@@ -437,7 +439,11 @@ static int subcore_init(void)
 
        set_subcores_per_core(1);
 
-       return device_create_file(cpu_subsys.dev_root,
-                                 &dev_attr_subcores_per_core);
+       dev_root = bus_get_dev_root(&cpu_subsys);
+       if (dev_root) {
+               rc = device_create_file(dev_root, &dev_attr_subcores_per_core);
+               put_device(dev_root);
+       }
+       return rc;
 }
 machine_device_initcall(powernv, subcore_init);