Commit 9493ed19 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarHeiko Carstens <hca@linux.ibm.com>
Link: https://lore.kernel.org/r/20230313182918.1312597-18-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 93c42c0b

arch/s390/kernel/topology.c

+10 −1
Original line number Diff line number Diff line
@@ -649,12 +649,21 @@ static struct ctl_table topology_dir_table[] = { 


static int __init topology_init(void)

{

	struct device *dev_root;

	int rc = 0;



	timer_setup(&topology_timer, topology_timer_fn, TIMER_DEFERRABLE);

	if (MACHINE_HAS_TOPOLOGY)

		set_topology_timer();

	else

		topology_update_polarization_simple();

	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);