From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 14:27:05 +0000 (+0800)
Subject: Revert "block: genhd: Add disk/partition specific uevent callbacks for partition... 
X-Git-Tag: firefly_0821_release~9972
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c0a6e192642d9a01dc47af5b200d5be549bdde56;p=firefly-linux-kernel-4.4.55.git

Revert "block: genhd: Add disk/partition specific uevent callbacks for partition info"

This reverts commit f9d6d7703fca9b9d5d92c6e71ed4263220059884.
---

diff --git a/block/genhd.c b/block/genhd.c
index cdd188b8ba3c..517e4332cb37 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -994,22 +994,6 @@ static void disk_release(struct device *dev)
 	free_part_stats(&disk->part0);
 	kfree(disk);
 }
-
-static int disk_uevent(struct device *dev, struct kobj_uevent_env *env)
-{
-	struct gendisk *disk = dev_to_disk(dev);
-	struct disk_part_iter piter;
-	struct hd_struct *part;
-	int cnt = 0;
-
-	disk_part_iter_init(&piter, disk, 0);
-	while((part = disk_part_iter_next(&piter)))
-		cnt++;
-	disk_part_iter_exit(&piter);
-	add_uevent_var(env, "NPARTS=%u", cnt);
-	return 0;
-}
-
 struct class block_class = {
 	.name		= "block",
 };
@@ -1028,7 +1012,6 @@ static struct device_type disk_type = {
 	.groups		= disk_attr_groups,
 	.release	= disk_release,
 	.devnode	= block_devnode,
-	.uevent		= disk_uevent,
 };
 
 #ifdef CONFIG_PROC_FS
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index ecfabf53d1ca..fb6938a0fb05 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -327,20 +327,10 @@ static void part_release(struct device *dev)
 	kfree(p);
 }
 
-static int part_uevent(struct device *dev, struct kobj_uvent_env *env)
-{
-	struct gendisk *disk = dev_to_disk(dev);
-	struct hd_struct *part = dev_to_part(dev);
-
-	add_uevent_var(env, "PARTN=%u", part->partno);
-	return 0;
-}
-
 struct device_type part_type = {
 	.name		= "partition",
 	.groups		= part_attr_groups,
 	.release	= part_release,
-	.uevent		= part_uevent,
 };
 
 static void delete_partition_rcu_cb(struct rcu_head *head)