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

Commit 39aba963 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

driver core: remove CONFIG_SYSFS_DEPRECATED_V2 but keep it for block devices 



This patch removes the old CONFIG_SYSFS_DEPRECATED_V2 config option,
but it keeps the logic around to handle block devices in the old manner
as some people like to run new kernel versions on old (pre 2007/2008)
distros.

Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: "James E.J. Bottomley" <James.Bottomley@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 807508c8

drivers/base/bus.c

+0 −22
Original line number Diff line number Diff line
@@ -440,22 +440,6 @@ static void device_remove_attrs(struct bus_type *bus, struct device *dev) 
	}

}



#ifdef CONFIG_SYSFS_DEPRECATED

static int make_deprecated_bus_links(struct device *dev)

{

	return sysfs_create_link(&dev->kobj,

				 &dev->bus->p->subsys.kobj, "bus");

}



static void remove_deprecated_bus_links(struct device *dev)

{

	sysfs_remove_link(&dev->kobj, "bus");

}

#else

static inline int make_deprecated_bus_links(struct device *dev) { return 0; }

static inline void remove_deprecated_bus_links(struct device *dev) { }

#endif



/**

 * bus_add_device - add device to bus

 * @dev: device being added
@@ -482,15 +466,10 @@ int bus_add_device(struct device *dev) 
				&dev->bus->p->subsys.kobj, "subsystem");

		if (error)

			goto out_subsys;

		error = make_deprecated_bus_links(dev);

		if (error)

			goto out_deprecated;

		klist_add_tail(&dev->p->knode_bus, &bus->p->klist_devices);

	}

	return 0;



out_deprecated:

	sysfs_remove_link(&dev->kobj, "subsystem");

out_subsys:

	sysfs_remove_link(&bus->p->devices_kset->kobj, dev_name(dev));

out_id:
@@ -530,7 +509,6 @@ void bus_remove_device(struct device *dev) 
{

	if (dev->bus) {

		sysfs_remove_link(&dev->kobj, "subsystem");

		remove_deprecated_bus_links(dev);

		sysfs_remove_link(&dev->bus->p->devices_kset->kobj,

				  dev_name(dev));

		device_remove_attrs(dev->bus, dev);

drivers/base/class.c

+0 −19
Original line number Diff line number Diff line
@@ -276,25 +276,6 @@ void class_destroy(struct class *cls) 
	class_unregister(cls);

}



#ifdef CONFIG_SYSFS_DEPRECATED

char *make_class_name(const char *name, struct kobject *kobj)

{

	char *class_name;

	int size;



	size = strlen(name) + strlen(kobject_name(kobj)) + 2;



	class_name = kmalloc(size, GFP_KERNEL);

	if (!class_name)

		return NULL;



	strcpy(class_name, name);

	strcat(class_name, ":");

	strcat(class_name, kobject_name(kobj));

	return class_name;

}

#endif



/**

 * class_dev_iter_init - initialize class device iterator

 * @iter: class iterator to initialize

drivers/base/core.c

+25 −169
Original line number Diff line number Diff line
@@ -203,37 +203,6 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj, 
	if (dev->driver)

		add_uevent_var(env, "DRIVER=%s", dev->driver->name);



#ifdef CONFIG_SYSFS_DEPRECATED

	if (dev->class) {

		struct device *parent = dev->parent;



		/* find first bus device in parent chain */

		while (parent && !parent->bus)

			parent = parent->parent;

		if (parent && parent->bus) {

			const char *path;



			path = kobject_get_path(&parent->kobj, GFP_KERNEL);

			if (path) {

				add_uevent_var(env, "PHYSDEVPATH=%s", path);

				kfree(path);

			}



			add_uevent_var(env, "PHYSDEVBUS=%s", parent->bus->name);



			if (parent->driver)

				add_uevent_var(env, "PHYSDEVDRIVER=%s",

					       parent->driver->name);

		}

	} else if (dev->bus) {

		add_uevent_var(env, "PHYSDEVBUS=%s", dev->bus->name);



		if (dev->driver)

			add_uevent_var(env, "PHYSDEVDRIVER=%s",

				       dev->driver->name);

	}

#endif



	/* have the bus specific function add its stuff */

	if (dev->bus && dev->bus->uevent) {

		retval = dev->bus->uevent(dev, env);
@@ -578,24 +547,6 @@ void device_initialize(struct device *dev) 
	set_dev_node(dev, -1);

}



#ifdef CONFIG_SYSFS_DEPRECATED

static struct kobject *get_device_parent(struct device *dev,

					 struct device *parent)

{

	/* class devices without a parent live in /sys/class/<classname>/ */

	if (dev->class && (!parent || parent->class != dev->class))

		return &dev->class->p->class_subsys.kobj;

	/* all other devices keep their parent */

	else if (parent)

		return &parent->kobj;



	return NULL;

}



static inline void cleanup_device_parent(struct device *dev) {}

static inline void cleanup_glue_dir(struct device *dev,

				    struct kobject *glue_dir) {}

#else

static struct kobject *virtual_device_parent(struct device *dev)

{

	static struct kobject *virtual_dir = NULL;
@@ -666,6 +617,14 @@ static struct kobject *get_device_parent(struct device *dev, 
		struct kobject *parent_kobj;

		struct kobject *k;



#ifdef CONFIG_SYSFS_DEPRECATED

		/* block disks show up in /sys/block */

		if (dev->class == &block_class) {

			if (parent && parent->class == &block_class)

				return &parent->kobj;

			return &block_class.p->class_subsys.kobj;

		}

#endif

		/*

		 * If we have no parent, we live in "virtual".

		 * Class-devices with a non class-device as parent, live
@@ -719,7 +678,6 @@ static void cleanup_device_parent(struct device *dev) 
{

	cleanup_glue_dir(dev, dev->kobj.parent);

}

#endif



static void setup_parent(struct device *dev, struct device *parent)

{
@@ -742,70 +700,29 @@ static int device_add_class_symlinks(struct device *dev) 
	if (error)

		goto out;



#ifdef CONFIG_SYSFS_DEPRECATED

	/* stacked class devices need a symlink in the class directory */

	if (dev->kobj.parent != &dev->class->p->class_subsys.kobj &&

	    device_is_not_partition(dev)) {

		error = sysfs_create_link(&dev->class->p->class_subsys.kobj,

					  &dev->kobj, dev_name(dev));

		if (error)

			goto out_subsys;

	}



	if (dev->parent && device_is_not_partition(dev)) {

		struct device *parent = dev->parent;

		char *class_name;



		/*

		 * stacked class devices have the 'device' link

		 * pointing to the bus device instead of the parent

		 */

		while (parent->class && !parent->bus && parent->parent)

			parent = parent->parent;



		error = sysfs_create_link(&dev->kobj,

					  &parent->kobj,

		error = sysfs_create_link(&dev->kobj, &dev->parent->kobj,

					  "device");

		if (error)

			goto out_busid;



		class_name = make_class_name(dev->class->name,

						&dev->kobj);

		if (class_name)

			error = sysfs_create_link(&dev->parent->kobj,

						&dev->kobj, class_name);

		kfree(class_name);

		if (error)

			goto out_device;

			goto out_subsys;

	}



#ifdef CONFIG_SYSFS_DEPRECATED

	/* /sys/block has directories and does not need symlinks */

	if (dev->class == &block_class)

		return 0;

#endif



out_device:

	if (dev->parent && device_is_not_partition(dev))

		sysfs_remove_link(&dev->kobj, "device");

out_busid:

	if (dev->kobj.parent != &dev->class->p->class_subsys.kobj &&

	    device_is_not_partition(dev))

		sysfs_delete_link(&dev->class->p->class_subsys.kobj, &dev->kobj,

				  dev_name(dev));

#else

	/* link in the class directory pointing to the device */

	error = sysfs_create_link(&dev->class->p->class_subsys.kobj,

				  &dev->kobj, dev_name(dev));

	if (error)

		goto out_subsys;

		goto out_device;



	if (dev->parent && device_is_not_partition(dev)) {

		error = sysfs_create_link(&dev->kobj, &dev->parent->kobj,

					  "device");

		if (error)

			goto out_busid;

	}

	return 0;



out_busid:

	sysfs_delete_link(&dev->class->p->class_subsys.kobj, &dev->kobj, dev_name(dev));

#endif

out_device:

	sysfs_remove_link(&dev->kobj, "device");



out_subsys:

	sysfs_remove_link(&dev->kobj, "subsystem");
@@ -818,30 +735,14 @@ static void device_remove_class_symlinks(struct device *dev) 
	if (!dev->class)

		return;



#ifdef CONFIG_SYSFS_DEPRECATED

	if (dev->parent && device_is_not_partition(dev)) {

		char *class_name;



		class_name = make_class_name(dev->class->name, &dev->kobj);

		if (class_name) {

			sysfs_remove_link(&dev->parent->kobj, class_name);

			kfree(class_name);

		}

		sysfs_remove_link(&dev->kobj, "device");

	}



	if (dev->kobj.parent != &dev->class->p->class_subsys.kobj &&

	    device_is_not_partition(dev))

		sysfs_delete_link(&dev->class->p->class_subsys.kobj, &dev->kobj,

				  dev_name(dev));

#else

	if (dev->parent && device_is_not_partition(dev))

		sysfs_remove_link(&dev->kobj, "device");



	sysfs_delete_link(&dev->class->p->class_subsys.kobj, &dev->kobj, dev_name(dev));

#endif



	sysfs_remove_link(&dev->kobj, "subsystem");

#ifdef CONFIG_SYSFS_DEPRECATED

	if (dev->class == &block_class)

		return;

#endif

	sysfs_delete_link(&dev->class->p->class_subsys.kobj, &dev->kobj, dev_name(dev));

}



/**
@@ -1613,41 +1514,23 @@ int device_rename(struct device *dev, const char *new_name) 
	pr_debug("device: '%s': %s: renaming to '%s'\n", dev_name(dev),

		 __func__, new_name);



#ifdef CONFIG_SYSFS_DEPRECATED

	if ((dev->class) && (dev->parent))

		old_class_name = make_class_name(dev->class->name, &dev->kobj);

#endif



	old_device_name = kstrdup(dev_name(dev), GFP_KERNEL);

	if (!old_device_name) {

		error = -ENOMEM;

		goto out;

	}



#ifndef CONFIG_SYSFS_DEPRECATED

	if (dev->class) {

		error = sysfs_rename_link(&dev->class->p->class_subsys.kobj,

			&dev->kobj, old_device_name, new_name);

		if (error)

			goto out;

	}

#endif



	error = kobject_rename(&dev->kobj, new_name);

	if (error)

		goto out;



#ifdef CONFIG_SYSFS_DEPRECATED

	if (old_class_name) {

		new_class_name = make_class_name(dev->class->name, &dev->kobj);

		if (new_class_name) {

			error = sysfs_rename_link(&dev->parent->kobj,

						  &dev->kobj,

						  old_class_name,

						  new_class_name);

		}

	}

#endif



out:

	put_device(dev);
@@ -1664,40 +1547,13 @@ static int device_move_class_links(struct device *dev, 
				   struct device *new_parent)

{

	int error = 0;

#ifdef CONFIG_SYSFS_DEPRECATED

	char *class_name;



	class_name = make_class_name(dev->class->name, &dev->kobj);

	if (!class_name) {

		error = -ENOMEM;

		goto out;

	}

	if (old_parent) {

		sysfs_remove_link(&dev->kobj, "device");

		sysfs_remove_link(&old_parent->kobj, class_name);

	}

	if (new_parent) {

		error = sysfs_create_link(&dev->kobj, &new_parent->kobj,

					  "device");

		if (error)

			goto out;

		error = sysfs_create_link(&new_parent->kobj, &dev->kobj,

					  class_name);

		if (error)

			sysfs_remove_link(&dev->kobj, "device");

	} else

		error = 0;

out:

	kfree(class_name);

	return error;

#else

	if (old_parent)

		sysfs_remove_link(&dev->kobj, "device");

	if (new_parent)

		error = sysfs_create_link(&dev->kobj, &new_parent->kobj,

					  "device");

	return error;

#endif

}



/**

drivers/scsi/hosts.c

+0 −2
Original line number Diff line number Diff line
@@ -411,9 +411,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) 


	device_initialize(&shost->shost_gendev);

	dev_set_name(&shost->shost_gendev, "host%d", shost->host_no);

#ifndef CONFIG_SYSFS_DEPRECATED

	shost->shost_gendev.bus = &scsi_bus_type;

#endif

	shost->shost_gendev.type = &scsi_host_type;



	device_initialize(&shost->shost_dev);

drivers/scsi/scsi_scan.c

+0 −2
Original line number Diff line number Diff line
@@ -417,9 +417,7 @@ static struct scsi_target *scsi_alloc_target(struct device *parent, 
	starget->reap_ref = 1;

	dev->parent = get_device(parent);

	dev_set_name(dev, "target%d:%d:%d", shost->host_no, channel, id);

#ifndef CONFIG_SYSFS_DEPRECATED

	dev->bus = &scsi_bus_type;

#endif

	dev->type = &scsi_target_type;

	starget->id = id;

	starget->channel = channel;