Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Driver Core: Move virtual_device_parent() to core.c 



It doesn't need to be global or in device.h


Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1901fb26

drivers/base/class.c

+0 −17
Original line number Diff line number Diff line
@@ -893,23 +893,6 @@ void class_interface_unregister(struct class_interface *class_intf) 
	class_put(parent);

}



int virtual_device_parent(struct device *dev)

{

	if (!dev->class)

		return -ENODEV;



	if (!dev->class->virtual_dir) {

		static struct kobject *virtual_dir = NULL;



		if (!virtual_dir)

			virtual_dir = kobject_add_dir(&devices_subsys.kset.kobj, "virtual");

		dev->class->virtual_dir = kobject_add_dir(virtual_dir, dev->class->name);

	}



	dev->kobj.parent = dev->class->virtual_dir;

	return 0;

}



int __init classes_init(void)

{

	int retval;

drivers/base/core.c

+17 −0
Original line number Diff line number Diff line
@@ -384,6 +384,23 @@ void device_initialize(struct device *dev) 
	device_init_wakeup(dev, 0);

}



static int virtual_device_parent(struct device *dev)

{

	if (!dev->class)

		return -ENODEV;



	if (!dev->class->virtual_dir) {

		static struct kobject *virtual_dir = NULL;



		if (!virtual_dir)

			virtual_dir = kobject_add_dir(&devices_subsys.kset.kobj, "virtual");

		dev->class->virtual_dir = kobject_add_dir(virtual_dir, dev->class->name);

	}



	dev->kobj.parent = dev->class->virtual_dir;

	return 0;

}



/**

 *	device_add - add device to device hierarchy.

 *	@dev:	device.

include/linux/device.h

+0 −2
Original line number Diff line number Diff line
@@ -440,8 +440,6 @@ extern struct device *device_create(struct class *cls, struct device *parent, 
				    __attribute__((format(printf,4,5)));

extern void device_destroy(struct class *cls, dev_t devt);



extern int virtual_device_parent(struct device *dev);



/*

 * Platform "fixup" functions - allow the platform to have their say

 * about devices and actions that the general device layer doesn't