mirror of
https://github.com/torvalds/linux.git
synced 2024-12-07 19:41:31 +00:00
s390/topology: 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: Vasily Gorbik <gor@linux.ibm.com> Cc: Alexander Gordeev <agordeev@linux.ibm.com> Cc: Christian Borntraeger <borntraeger@linux.ibm.com> Cc: Sven Schnelle <svens@linux.ibm.com> Cc: linux-s390@vger.kernel.org Acked-by: Heiko Carstens <hca@linux.ibm.com> Link: https://lore.kernel.org/r/20230313182918.1312597-18-gregkh@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
93c42c0b03
commit
9493ed19fb
@ -649,12 +649,21 @@ static struct ctl_table topology_dir_table[] = {
|
|||||||
|
|
||||||
static int __init topology_init(void)
|
static int __init topology_init(void)
|
||||||
{
|
{
|
||||||
|
struct device *dev_root;
|
||||||
|
int rc = 0;
|
||||||
|
|
||||||
timer_setup(&topology_timer, topology_timer_fn, TIMER_DEFERRABLE);
|
timer_setup(&topology_timer, topology_timer_fn, TIMER_DEFERRABLE);
|
||||||
if (MACHINE_HAS_TOPOLOGY)
|
if (MACHINE_HAS_TOPOLOGY)
|
||||||
set_topology_timer();
|
set_topology_timer();
|
||||||
else
|
else
|
||||||
topology_update_polarization_simple();
|
topology_update_polarization_simple();
|
||||||
register_sysctl_table(topology_dir_table);
|
register_sysctl_table(topology_dir_table);
|
||||||
return device_create_file(cpu_subsys.dev_root, &dev_attr_dispatching);
|
|
||||||
|
dev_root = bus_get_dev_root(&cpu_subsys);
|
||||||
|
if (dev_root) {
|
||||||
|
rc = device_create_file(dev_root, &dev_attr_dispatching);
|
||||||
|
put_device(dev_root);
|
||||||
|
}
|
||||||
|
return rc;
|
||||||
}
|
}
|
||||||
device_initcall(topology_init);
|
device_initcall(topology_init);
|
||||||
|
Loading…
Reference in New Issue
Block a user