X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libudev%2Flibudev-device.c;h=b3b6a63114106f973327b5a594762df6c5bdc293;hb=b3ad0c3c6fce3c04a2f3070200001d6566d1b322;hp=fe4588015cc4519d65446cb287278276e611f371;hpb=fc8d61c53d6c181dc1e9f5a23c0f805c32a392af;p=elogind.git

diff --git a/libudev/libudev-device.c b/libudev/libudev-device.c
index fe4588015..b3b6a6311 100644
--- a/libudev/libudev-device.c
+++ b/libudev/libudev-device.c
@@ -63,7 +63,6 @@ struct udev_device {
 	unsigned long long int seqnum;
 	int event_timeout;
 	int timeout;
-	int num_fake_partitions;
 	int devlink_priority;
 	int refcount;
 	dev_t devnum;
@@ -76,7 +75,6 @@ struct udev_device {
 	unsigned int envp_uptodate:1;
 	unsigned int driver_set:1;
 	unsigned int info_loaded:1;
-	unsigned int ignore_remove:1;
 };
 
 struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value)
@@ -284,12 +282,6 @@ int udev_device_read_db(struct udev_device *udev_device)
 		case 'T':
 			udev_device_set_event_timeout(udev_device, atoi(val));
 			break;
-		case 'A':
-			udev_device_set_num_fake_partitions(udev_device, atoi(val));
-			break;
-		case 'R':
-			udev_device_set_ignore_remove(udev_device, atoi(val));
-			break;
 		case 'E':
 			udev_device_add_property_from_string(udev_device, val);
 			break;
@@ -463,10 +455,9 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *
  * @devnum: device major/minor number
  *
  * Create new udev device, and fill in information from the sys
- * device and the udev database entry. The device is looked up
- * by its major/minor number. Character and block device numbers
- * are not unique across the two types, they do not share the same
- * range of numbers.
+ * device and the udev database entry. The device is looked-up
+ * by its major/minor number and type. Character and block device
+ * numbers are not unique across the two types.
  *
  * The initial refcount is 1, and needs to be decremented to
  * release the resources of the udev device.
@@ -497,10 +488,9 @@ struct udev_device *udev_device_new_from_devnum(struct udev *udev, char type, de
  * @subsystem: the subsystem of the device
  * @sysname: the name of the device
  *
- * Create new udev device, and fill in information from the sys
- * device and the udev database entry. The device is looked up
- * by the subsystem and name string of the device, like "mem",
- * "zero", or "block", "sda".
+ * Create new udev device, and fill in information from the sys device
+ * and the udev database entry. The device is looked up by the subsystem
+ * and name string of the device, like "mem" / "zero", or "block" / "sda".
  *
  * The initial refcount is 1, and needs to be decremented to
  * release the resources of the udev device.
@@ -1427,19 +1417,6 @@ int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum)
 	return 0;
 }
 
-int udev_device_get_num_fake_partitions(struct udev_device *udev_device)
-{
-	if (!udev_device->info_loaded)
-		device_load_info(udev_device);
-	return udev_device->num_fake_partitions;
-}
-
-int udev_device_set_num_fake_partitions(struct udev_device *udev_device, int num)
-{
-	udev_device->num_fake_partitions = num;
-	return 0;
-}
-
 int udev_device_get_devlink_priority(struct udev_device *udev_device)
 {
 	if (!udev_device->info_loaded)
@@ -1453,19 +1430,6 @@ int udev_device_set_devlink_priority(struct udev_device *udev_device, int prio)
 	return 0;
 }
 
-int udev_device_get_ignore_remove(struct udev_device *udev_device)
-{
-	if (!udev_device->info_loaded)
-		device_load_info(udev_device);
-	return udev_device->ignore_remove;
-}
-
-int udev_device_set_ignore_remove(struct udev_device *udev_device, int ignore)
-{
-	udev_device->ignore_remove = ignore;
-	return 0;
-}
-
 int udev_device_get_watch_handle(struct udev_device *udev_device)
 {
 	if (!udev_device->info_loaded)