X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fblock%2Fgenhd.c;h=c68215b35252c546775370b30d42ac978cca28e3;hb=6367666f534ee8fa9c6a7b667f38b5e445f85918;hp=bfbdcf0a36f8a91837df2b67d369ea71a46c73ff;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/drivers/block/genhd.c b/drivers/block/genhd.c
index bfbdcf0a3..c68215b35 100644
--- a/drivers/block/genhd.c
+++ b/drivers/block/genhd.c
@@ -438,52 +438,8 @@ static int block_hotplug_filter(struct kset *kset, struct kobject *kobj)
 	return ((ktype == &ktype_block) || (ktype == &ktype_part));
 }
 
-static int block_hotplug(struct kset *kset, struct kobject *kobj, char **envp,
-			 int num_envp, char *buffer, int buffer_size)
-{
-	struct device *dev = NULL;
-	struct kobj_type *ktype = get_ktype(kobj);
-	int length = 0;
-	int i = 0;
-
-	/* get physical device backing disk or partition */
-	if (ktype == &ktype_block) {
-		struct gendisk *disk = container_of(kobj, struct gendisk, kobj);
-		dev = disk->driverfs_dev;
-	} else if (ktype == &ktype_part) {
-		struct gendisk *disk = container_of(kobj->parent, struct gendisk, kobj);
-		dev = disk->driverfs_dev;
-	}
-
-	if (dev) {
-		/* add physical device, backing this device  */
-		char *path = kobject_get_path(&dev->kobj, GFP_KERNEL);
-
-		add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size,
-				    &length, "PHYSDEVPATH=%s", path);
-		kfree(path);
-
-		/* add bus name of physical device */
-		if (dev->bus)
-			add_hotplug_env_var(envp, num_envp, &i,
-					    buffer, buffer_size, &length,
-					    "PHYSDEVBUS=%s", dev->bus->name);
-
-		/* add driver name of physical device */
-		if (dev->driver)
-			add_hotplug_env_var(envp, num_envp, &i,
-					    buffer, buffer_size, &length,
-					    "PHYSDEVDRIVER=%s", dev->driver->name);
-
-		envp[i] = NULL;
-	}
-
-	return 0;
-}
-
 static struct kset_hotplug_ops block_hotplug_ops = {
-	.filter		= block_hotplug_filter,
-	.hotplug	= block_hotplug,
+	.filter	= block_hotplug_filter,
 };
 
 /* declare block_subsys. */