Commit 1b401896 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

powerpc/sysfs: move to use bus_get_dev_root()

Direct access to the struct bus_type dev_root pointer is going away soon
so replace that with a call to bus_get_dev_root() instead, which is what
it is there for.

Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: David Hildenbrand <david@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linuxppc-dev@lists.ozlabs.org
Link: https://lore.kernel.org/r/20230313182918.1312597-12-gregkh@linuxfoundation.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cb6b0cba
...@@ -217,13 +217,18 @@ static DEVICE_ATTR(dscr_default, 0600, ...@@ -217,13 +217,18 @@ static DEVICE_ATTR(dscr_default, 0600,
static void __init sysfs_create_dscr_default(void) static void __init sysfs_create_dscr_default(void)
{ {
if (cpu_has_feature(CPU_FTR_DSCR)) { if (cpu_has_feature(CPU_FTR_DSCR)) {
struct device *dev_root;
int cpu; int cpu;
dscr_default = spr_default_dscr; dscr_default = spr_default_dscr;
for_each_possible_cpu(cpu) for_each_possible_cpu(cpu)
paca_ptrs[cpu]->dscr_default = dscr_default; paca_ptrs[cpu]->dscr_default = dscr_default;
device_create_file(cpu_subsys.dev_root, &dev_attr_dscr_default); dev_root = bus_get_dev_root(&cpu_subsys);
if (dev_root) {
device_create_file(dev_root, &dev_attr_dscr_default);
put_device(dev_root);
}
} }
} }
#endif /* CONFIG_PPC64 */ #endif /* CONFIG_PPC64 */
...@@ -746,7 +751,12 @@ static DEVICE_ATTR(svm, 0444, show_svm, NULL); ...@@ -746,7 +751,12 @@ static DEVICE_ATTR(svm, 0444, show_svm, NULL);
static void __init create_svm_file(void) static void __init create_svm_file(void)
{ {
device_create_file(cpu_subsys.dev_root, &dev_attr_svm); struct device *dev_root = bus_get_dev_root(&cpu_subsys);
if (dev_root) {
device_create_file(dev_root, &dev_attr_svm);
put_device(dev_root);
}
} }
#else #else
static void __init create_svm_file(void) static void __init create_svm_file(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment