hal: Branch 'origin'

[Kay Sievers]

 hald/linux/device.c  |    6 +++---
 hald/linux/hotplug.c |   11 ++---------
 2 files changed, 5 insertions(+), 12 deletions(-)

New commits:
diff-tree 4b40b4370fadd3f8654ec799625f0d55680c8fb5 (from b105ec345ad12fc4eff158c9aeaab78caebe9a71)
Author: Kay Sievers <kay.sievers at suse.de>
Date:   Wed Oct 11 11:05:42 2006 +0200

    remove left-over "class device" from debug output

diff --git a/hald/linux/device.c b/hald/linux/device.c
index 4aed560..9f1a86a 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -2774,7 +2774,7 @@ hotplug_event_begin_add_dev (const gchar
 {
 	guint i;
 
-	HAL_INFO (("class_add: subsys=%s sysfs_path=%s dev=%s parent_dev=0x%08x", subsystem, sysfs_path, device_file, parent_dev));
+	HAL_INFO (("add_dev: subsys=%s sysfs_path=%s dev=%s parent_dev=0x%08x", subsystem, sysfs_path, device_file, parent_dev));
 
 	/* update driver property of the parent device, cause manual driver bind/unbind
 	 * may change change this without sending events for the bus device
@@ -2783,7 +2783,7 @@ hotplug_event_begin_add_dev (const gchar
 		hal_util_set_driver (parent_dev, "info.linux.driver", parent_path);
 
 	if (parent_dev != NULL && hal_device_property_get_bool (parent_dev, "info.ignore")) {
-		HAL_INFO (("Ignoring class_add since parent_dev has info.ignore==TRUE"));
+		HAL_INFO (("Ignoring add_dev since parent_dev has info.ignore==TRUE"));
 		hotplug_event_end (end_token);
 		goto out;
 	}
@@ -2834,7 +2834,7 @@ hotplug_event_begin_remove_dev (const gc
 	HalDevice *d;
 
 
-	HAL_INFO (("class_rem: subsys=%s sysfs_path=%s", subsystem, sysfs_path));
+	HAL_INFO (("remove_dev: subsys=%s sysfs_path=%s", subsystem, sysfs_path));
 
 	d = hal_device_store_match_key_value_string (hald_get_gdl (), "linux.sysfs_path", sysfs_path);
 	if (d == NULL) {
diff --git a/hald/linux/hotplug.c b/hald/linux/hotplug.c
index 79c5e48..1b9282a 100644
--- a/hald/linux/hotplug.c
+++ b/hald/linux/hotplug.c
@@ -108,7 +108,7 @@ hotplug_event_begin_sysfs (HotplugEvent 
 
 		type = hal_device_property_get_int (d, "linux.hotplug_type");
 		if (type == HOTPLUG_EVENT_SYSFS_DEVICE) {
-			HAL_INFO (("%s is a class device (store)", hotplug_event->sysfs.sysfs_path));
+			HAL_INFO (("%s is a device (store)", hotplug_event->sysfs.sysfs_path));
 			hotplug_event->type = HOTPLUG_EVENT_SYSFS_DEVICE;
 		} else if (type == HOTPLUG_EVENT_SYSFS_BLOCK) {
 			HAL_INFO (("%s is a block device (store)", hotplug_event->sysfs.sysfs_path));
@@ -129,7 +129,7 @@ hotplug_event_begin_sysfs (HotplugEvent 
 				HAL_INFO (("%s is a block device (subsystem)", hotplug_event->sysfs.sysfs_path));
 				hotplug_event->type = HOTPLUG_EVENT_SYSFS_BLOCK;
 			} else {
-				HAL_INFO (("%s is a class device (subsystem)", hotplug_event->sysfs.sysfs_path));
+				HAL_INFO (("%s is a device (subsystem)", hotplug_event->sysfs.sysfs_path));
 				hotplug_event->type = HOTPLUG_EVENT_SYSFS_DEVICE;
 			}
 			g_free (subsystem_target);
@@ -138,17 +138,10 @@ hotplug_event_begin_sysfs (HotplugEvent 
 
 	/* older kernels get the device type from the devpath */
 	if (hotplug_event->type == HOTPLUG_EVENT_SYSFS) {
-		char sys_devices_path[HAL_PATH_MAX];
-		char sys_class_path[HAL_PATH_MAX];
 		char sys_block_path[HAL_PATH_MAX];
-		gsize sys_devices_path_len;
-		gsize sys_class_path_len;
 		gsize sys_block_path_len;
 
-		sys_devices_path_len = g_snprintf (sys_devices_path, HAL_PATH_MAX, "%s/devices", get_hal_sysfs_path ());
-		sys_class_path_len   = g_snprintf (sys_class_path, HAL_PATH_MAX, "%s/class", get_hal_sysfs_path ());
 		sys_block_path_len   = g_snprintf (sys_block_path, HAL_PATH_MAX, "%s/block", get_hal_sysfs_path ());
-
 		if (strncmp (hotplug_event->sysfs.sysfs_path, sys_block_path, sys_block_path_len) == 0) {
 			HAL_INFO (("%s is a block device (devpath)", hotplug_event->sysfs.sysfs_path));
 			hotplug_event->type = HOTPLUG_EVENT_SYSFS_BLOCK;