hal: Branch 'master'

Danny Kukawka dkukawka at kemper.freedesktop.org
Mon Mar 3 04:47:28 PST 2008 

 doc/spec/hal-spec-properties.xml                    |    6 ------
 fdi/policy/10osvendor/10-dell-laptop-brightness.fdi |    2 +-
 hald/device_info.c                                  |    1 -
 hald/dummy/osspec.c                                 |    1 -
 hald/freebsd/hf-ata.c                               |    2 --
 hald/freebsd/hf-block.c                             |    1 -
 hald/freebsd/hf-computer.c                          |    1 -
 hald/freebsd/hf-pci.c                               |    1 -
 hald/freebsd/hf-pcmcia.c                            |    1 -
 hald/freebsd/hf-scsi.c                              |    2 --
 hald/freebsd/hf-usb.c                               |    4 +---
 hald/linux/device.c                                 |   19 -------------------
 hald/linux/osspec.c                                 |    1 -
 hald/solaris/devinfo_ieee1394.c                     |    1 -
 hald/solaris/devinfo_misc.c                         |    2 --
 hald/solaris/devinfo_pci.c                          |    1 -
 hald/solaris/devinfo_storage.c                      |    4 ----
 hald/solaris/devinfo_usb.c                          |    2 --
 18 files changed, 2 insertions(+), 50 deletions(-)

New commits:
commit 6293fa33b4d843f94dd099a3d88ecd33741cf0c5
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Mar 3 13:47:15 2008 +0100

    removed deprecated and outdated info.bus
    
    Removed deprecated info.bus property from hal. The key reached end of
    lifetime with 2008-03-01 and was replaced by info.subsystem.

diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 34e700d..8269c1d 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -7105,12 +7105,6 @@ org.freedesktop.Hal.Device.Volume.method_signatures = {'ssas', 'as', 'as'}
           </thead>
           <tbody>
             <row>
-              <entry><literal>info.bus</literal> (string)</entry>
-              <entry><literal>info.subsystem</literal></entry>
-              <entry>2008-03-01</entry>
-              <entry>Renamed to something more abstract, available until removed.</entry>
-            </row>
-            <row>
               <entry><literal>*.physical_device</literal> (string)</entry>
               <entry><literal>*.originating_device</literal></entry>
               <entry>2008-03-01</entry>
diff --git a/fdi/policy/10osvendor/10-dell-laptop-brightness.fdi b/fdi/policy/10osvendor/10-dell-laptop-brightness.fdi
index 6b9f5a9..b0526b2 100644
--- a/fdi/policy/10osvendor/10-dell-laptop-brightness.fdi
+++ b/fdi/policy/10osvendor/10-dell-laptop-brightness.fdi
@@ -9,7 +9,7 @@
        to work correctly.
        See http://bugs.freedesktop.org/show_bug.cgi?id=7221 for details. -->
   <device>
-    <match key="info.bus" string="platform">
+    <match key="info.subsystem" string="platform">
       <match key="platform.id" string="dcdbas">
         <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
           <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell ">
diff --git a/hald/device_info.c b/hald/device_info.c
index 88936cd..9b14f5d 100644
--- a/hald/device_info.c
+++ b/hald/device_info.c
@@ -1021,7 +1021,6 @@ handle_merge (struct rule *rule, HalDevice *d)
 				   key, hal_device_get_udi (d)));
 			spawned = hal_device_new ();
 			hal_device_property_set_string (spawned, "info.subsystem", "unknown");
-			hal_device_property_set_string (spawned, "info.bus", "unknown");
 			hal_device_property_set_string (spawned, "info.udi", key);
 			hal_device_property_set_string (spawned, "info.parent", hal_device_get_udi (d));
 			hal_device_set_udi (spawned, key);
diff --git a/hald/dummy/osspec.c b/hald/dummy/osspec.c
index 40ed1a4..18312ac 100644
--- a/hald/dummy/osspec.c
+++ b/hald/dummy/osspec.c
@@ -82,7 +82,6 @@ osspec_probe (void)
 
 	root = hal_device_new ();
 	hal_device_property_set_string (root, "info.subsystem", "unknown");
-	hal_device_property_set_string (root, "info.bus", "unknown");
 	hal_device_property_set_string (root, "info.product", "Computer");
 	hal_device_property_set_string (root, "info.udi", "/org/freedesktop/Hal/devices/computer");
 	hal_device_set_udi (root, "/org/freedesktop/Hal/devices/computer");
diff --git a/hald/freebsd/hf-ata.c b/hald/freebsd/hf-ata.c
index 0c9d327..34992a3 100644
--- a/hald/freebsd/hf-ata.c
+++ b/hald/freebsd/hf-ata.c
@@ -78,7 +78,6 @@ hf_ata_ide_device_new (HalDevice *parent, int ms)
   hf_device_set_udi(device, "ide_%i_%i", host, ms);
 
   hal_device_property_set_string(device, "info.subsystem", "ide");
-  hal_device_property_set_string(device, "info.bus", "ide");
   hf_device_property_set_string_printf(device, "info.product", "IDE Device (%s)", ms == 0 ? "Master" : "Slave");
 
   hal_device_property_set_int(device, "ide.host", host);
@@ -298,7 +297,6 @@ hf_ata_channel_set_properties (HalDevice *device)
   hf_device_set_udi(device, "ide_host_%i", unit);
 
   hal_device_property_set_string(device, "info.subsystem", "ide_host");
-  hal_device_property_set_string(device, "info.bus", "ide_host");
   hal_device_property_set_int(device, "ide_host.number", unit);
 }
 
diff --git a/hald/freebsd/hf-block.c b/hald/freebsd/hf-block.c
index 60ece33..4fa30ac 100644
--- a/hald/freebsd/hf-block.c
+++ b/hald/freebsd/hf-block.c
@@ -154,7 +154,6 @@ hf_block_device_enable (HalDevice *device, const char *devname)
   hal_device_add_capability(device, "block");
 
   hal_device_property_set_string(device, "info.subsystem", "block");
-  hal_device_property_set_string(device, "info.bus", "block");
   hal_device_property_set_string(device, "info.category", "block"); /* FIXME? */
 
   hf_device_property_set_string_printf(device, "block.device", "/dev/%s", devname);
diff --git a/hald/freebsd/hf-computer.c b/hald/freebsd/hf-computer.c
index 3369d08..a73dda2 100644
--- a/hald/freebsd/hf-computer.c
+++ b/hald/freebsd/hf-computer.c
@@ -130,7 +130,6 @@ hf_computer_device_add (void)
   device = hal_device_new();
   hf_device_set_udi(device, "computer");
   hal_device_property_set_string(device, "info.subsystem", "unknown");
-  hal_device_property_set_string(device, "info.bus", "unknown");
   hal_device_property_set_string(device, "info.product", "Computer");
 
   if (uname(&un) == 0)
diff --git a/hald/freebsd/hf-pci.c b/hald/freebsd/hf-pci.c
index 85c6f72..273118e 100644
--- a/hald/freebsd/hf-pci.c
+++ b/hald/freebsd/hf-pci.c
@@ -101,7 +101,6 @@ hf_pci_device_new (HalDevice *parent, const struct pci_conf *p, int secondary_bu
 
   hf_device_set_udi(device, "pci_%.4x_%.4x", p->pc_vendor, p->pc_device);
   hal_device_property_set_string(device, "info.subsystem", "pci");
-  hal_device_property_set_string(device, "info.bus", "pci");
   hal_device_property_set_int(device, "pci.device_class", p->pc_class);
   hal_device_property_set_int(device, "pci.device_subclass", p->pc_subclass);
   hal_device_property_set_int(device, "pci.device_protocol", p->pc_progif);
diff --git a/hald/freebsd/hf-pcmcia.c b/hald/freebsd/hf-pcmcia.c
index c24b327..8c4fa1a 100644
--- a/hald/freebsd/hf-pcmcia.c
+++ b/hald/freebsd/hf-pcmcia.c
@@ -143,7 +143,6 @@ hf_pcmcia_set_properties (HalDevice *device)
 {
 
   hal_device_property_set_string(device, "info.subsystem", "pcmcia");
-  hal_device_property_set_string(device, "info.bus", "pcmcia");
   hal_device_add_capability(device, "pcmcia_socket");
   hal_device_property_set_string(device, "info.category", "pcmcia_socket");
   hal_device_property_set_int(device, "pcmcia_socket.number",
diff --git a/hald/freebsd/hf-scsi.c b/hald/freebsd/hf-scsi.c
index 1303002..e5cd46a 100644
--- a/hald/freebsd/hf-scsi.c
+++ b/hald/freebsd/hf-scsi.c
@@ -68,7 +68,6 @@ hf_scsi_bus_device_new (HalDevice *parent,
   device = hf_device_new(parent);
 
   hal_device_property_set_string(device, "info.subsystem", "scsi_host");
-  hal_device_property_set_string(device, "info.bus", "scsi_host");
   hal_device_property_set_int(device, "scsi_host.host", match->path_id);
   hal_device_property_set_string(device, "info.product", "SCSI Host Adapter");
 
@@ -93,7 +92,6 @@ hf_scsi_scsi_device_new (HalDevice *parent,
   device = hf_device_new(parent);
 
   hal_device_property_set_string(device, "info.subsystem", "scsi");
-  hal_device_property_set_string(device, "info.bus", "scsi");
   hal_device_property_set_int(device, "scsi.host", match->path_id);
   hal_device_property_set_int(device, "scsi.bus", match->path_id);
   hal_device_property_set_int(device, "scsi.target", match->target_id);
diff --git a/hald/freebsd/hf-usb.c b/hald/freebsd/hf-usb.c
index 22551c6..d04f7f2 100644
--- a/hald/freebsd/hf-usb.c
+++ b/hald/freebsd/hf-usb.c
@@ -335,8 +335,6 @@ hf_usb_device_new (HalDevice *parent,
   device = hf_device_new(parent);
 
   hal_device_property_set_string(device, "info.subsystem", "usb_device");
-  hal_device_property_set_string(device, "info.bus", "usb_device");
-
   hal_device_property_set_string(device, "info.product", di->udi_product);
   hal_device_property_set_string(device, "info.vendor", di->udi_vendor);
 
@@ -470,7 +468,7 @@ hf_usb_interface_device_new (HalDevice *parent,
 
   device = hf_device_new(parent);
 
-  hal_device_property_set_string(device, "info.bus", "usb");
+  hal_device_property_set_string(device, "info.subsystem", "usb");
 
   hal_device_merge_with_rewrite(device, parent, "usb.", "usb_device.");
 
diff --git a/hald/linux/device.c b/hald/linux/device.c
index 6c28d83..168c89a 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -1545,7 +1545,6 @@ pci_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "pci");
-	hal_device_property_set_string (d, "info.bus", "pci");
 	if (parent_dev != NULL) {
 		hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
 	} else {
@@ -1712,7 +1711,6 @@ usb_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
 		gint bmAttributes;
 
 		hal_device_property_set_string (d, "info.subsystem", "usb_device");
-		hal_device_property_set_string (d, "info.bus", "usb_device");
 
 		hal_util_set_driver (d, "info.linux.driver", sysfs_path);
 
@@ -1799,7 +1797,6 @@ usb_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
 
 	} else {
 		hal_device_property_set_string (d, "info.subsystem", "usb");
-		hal_device_property_set_string (d, "info.bus", "usb");
 
 		/* take all usb_device.* properties from parent and make them usb.* on this object */
 		if (parent_dev != NULL)
@@ -1864,7 +1861,6 @@ ide_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "ide");
-	hal_device_property_set_string (d, "info.bus", "ide");
 	if (parent_dev != NULL) {
 		hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
 	} else {
@@ -1915,7 +1911,6 @@ pnp_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "pnp");
-	hal_device_property_set_string (d, "info.bus", "pnp");
 	if (parent_dev != NULL) {
 		hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
 	} else {
@@ -1971,7 +1966,6 @@ platform_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *pare
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "platform");
-	hal_device_property_set_string (d, "info.bus", "platform");
 	if (parent_dev != NULL) {
 		hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
 	} else {
@@ -2039,7 +2033,6 @@ serio_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "serio");
-	hal_device_property_set_string (d, "info.bus", "serio");
 	if (parent_dev != NULL) {
 		hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
 	} else {
@@ -2087,7 +2080,6 @@ pcmcia_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "pcmcia");
-	hal_device_property_set_string (d, "info.bus", "pcmcia");
 	if (parent_dev != NULL) {
 		hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
 	} else {
@@ -2172,7 +2164,6 @@ scsi_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_d
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "scsi");
-	hal_device_property_set_string (d, "info.bus", "scsi");
 	hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
 	hal_device_property_set_int (d, "scsi.host", host_num);
 	hal_device_property_set_int (d, "scsi.bus", bus_num);
@@ -2263,7 +2254,6 @@ mmc_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "mmc");
-	hal_device_property_set_string (d, "info.bus", "mmc");
 	hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
 
 	hal_util_set_driver (d, "info.linux.driver", sysfs_path);
@@ -2341,7 +2331,6 @@ xen_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "xen");
-	hal_device_property_set_string (d, "info.bus", "xen");
 	if (parent_dev != NULL) {
 		hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
 	} else {
@@ -2423,7 +2412,6 @@ ieee1394_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *pare
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "ieee1394");
-	hal_device_property_set_string (d, "info.bus", "ieee1394");
 	hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
 
 	hal_util_set_driver (d, "info.linux.driver", sysfs_path);
@@ -2489,7 +2477,6 @@ firewire_add_device (const gchar *sysfs_path, const gchar *device_file, HalDevic
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "ieee1394");
-	hal_device_property_set_string (d, "info.bus", "ieee1394");
 	hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
 	hal_device_add_capability (d, "ieee1394");
 	hal_device_property_set_string (d, "ieee1394.device", device_file);
@@ -2525,7 +2512,6 @@ firewire_add_unit (const gchar *sysfs_path, int unit_id, HalDevice *parent_dev)
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "ieee1394_unit");
-	hal_device_property_set_string (d, "info.bus", "ieee1394_unit");
 	hal_device_property_set_string (d, "info.parent",
 					hal_device_get_udi (parent_dev));
 	hal_device_property_set_string (d, "ieee1394_unit.originating_device", 
@@ -2709,7 +2695,6 @@ ccw_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "ccw");
-	hal_device_property_set_string (d, "info.bus", "ccw");
 	if (parent_dev != NULL)
                 hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
         else
@@ -2880,7 +2865,6 @@ ccwgroup_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *pare
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "ccwgroup");
-	hal_device_property_set_string (d, "info.bus", "ccwgroup");
 	if (parent_dev != NULL)
                 hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
         else
@@ -2946,7 +2930,6 @@ iucv_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_d
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "iucv");
-	hal_device_property_set_string (d, "info.bus", "iucv");
 	if (parent_dev != NULL)
                 hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
         else
@@ -3473,7 +3456,6 @@ ps3_system_bus_add (const gchar *sysfs_path, const gchar *device_file, HalDevice
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "ps3_system_bus");
-	hal_device_property_set_string (d, "info.bus", "ps3_system_bus");
 	if (parent_dev != NULL) {
 		hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
 	} else {
@@ -3518,7 +3500,6 @@ pseudo_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent
 	d = hal_device_new ();
 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "pseudo");
-	hal_device_property_set_string (d, "info.bus", "pseudo");
 	if (parent_dev != NULL) {
 		hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
 	} else {
diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
index e8bfa7b..0dcf618 100644
--- a/hald/linux/osspec.c
+++ b/hald/linux/osspec.c
@@ -828,7 +828,6 @@ osspec_probe (void)
 	hald_runner_set_method_run_notify ((HaldRunnerRunNotify) hotplug_event_process_queue, NULL);
 	root = hal_device_new ();
 	hal_device_property_set_string (root, "info.subsystem", "unknown");
-	hal_device_property_set_string (root, "info.bus", "unknown");
 	hal_device_property_set_string (root, "info.product", "Computer");
 	hal_device_property_set_string (root, "info.udi", "/org/freedesktop/Hal/devices/computer");
 	hal_device_set_udi (root, "/org/freedesktop/Hal/devices/computer");
diff --git a/hald/solaris/devinfo_ieee1394.c b/hald/solaris/devinfo_ieee1394.c
index 4b85f41..f1a0e8b 100644
--- a/hald/solaris/devinfo_ieee1394.c
+++ b/hald/solaris/devinfo_ieee1394.c
@@ -81,7 +81,6 @@ devinfo_scsa1394_add(HalDevice *parent, di_node_t node, gchar *devfs_path)
 
 	devinfo_set_default_properties (d, parent, node, devfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "ieee1394");
-	hal_device_property_set_string (d, "info.bus", "ieee1394");
 	hal_device_property_set_string (d, "info.product", "FireWire SBP-2 device");
 
 	devinfo_add_enqueue (d, devfs_path, &devinfo_ieee1394_handler);
diff --git a/hald/solaris/devinfo_misc.c b/hald/solaris/devinfo_misc.c
index 78498d9..d684445 100644
--- a/hald/solaris/devinfo_misc.c
+++ b/hald/solaris/devinfo_misc.c
@@ -70,7 +70,6 @@ devinfo_computer_add(HalDevice *parent, di_node_t node, char *devfs_path, char *
 	d = hal_device_new ();
 
         hal_device_property_set_string (d, "info.subsystem", "unknown");
-        hal_device_property_set_string (d, "info.bus", "unknown");
         hal_device_property_set_string (d, "info.product", "Computer");
         hal_device_property_set_string (d, "info.udi", "/org/freedesktop/Hal/devices/computer");
         hal_device_set_udi (d, "/org/freedesktop/Hal/devices/computer");
@@ -89,7 +88,6 @@ devinfo_computer_add(HalDevice *parent, di_node_t node, char *devfs_path, char *
 
 	hal_device_property_set_string (local_d, "info.parent", hal_device_get_udi (d));
         hal_device_property_set_string (local_d, "info.subsystem", "unknown");
-        hal_device_property_set_string (local_d, "info.bus", "unknown");
         hal_device_property_set_string (local_d, "info.product", "Local devices");
         hal_device_property_set_string (local_d, "info.udi", "/org/freedesktop/Hal/devices/local");
         hal_device_set_udi (local_d, "/org/freedesktop/Hal/devices/local");
diff --git a/hald/solaris/devinfo_pci.c b/hald/solaris/devinfo_pci.c
index 9b3c2d6..415d2f6 100644
--- a/hald/solaris/devinfo_pci.c
+++ b/hald/solaris/devinfo_pci.c
@@ -63,7 +63,6 @@ HalDevice *devinfo_pci_add (HalDevice *parent, di_node_t node, char *devfs_path,
 	devinfo_set_default_properties (d, parent, node, devfs_path);
 
 	hal_device_property_set_string (d, "info.subsystem", "pci");
-	hal_device_property_set_string (d, "info.bus", "pci");
 
 	vid = pid = svid = spid = 0;
         if (di_prop_lookup_ints (DDI_DEV_T_ANY, node, "vendor-id", &i) > 0) {
diff --git a/hald/solaris/devinfo_storage.c b/hald/solaris/devinfo_storage.c
index 9181572..497b8ce 100644
--- a/hald/solaris/devinfo_storage.c
+++ b/hald/solaris/devinfo_storage.c
@@ -166,7 +166,6 @@ devinfo_ide_host_add(HalDevice *parent, di_node_t node, char *devfs_path)
 	devinfo_set_default_properties (d, parent, node, devfs_path);
 	hal_device_property_set_string (d, "info.product", "IDE host controller");
 	hal_device_property_set_string (d, "info.subsystem", "ide_host");
-	hal_device_property_set_string (d, "info.bus", "ide_host");
 	hal_device_property_set_int (d, "ide_host.number", 0); /* XXX */
 
 	devinfo_add_enqueue (d, devfs_path, &devinfo_ide_handler);
@@ -184,7 +183,6 @@ devinfo_ide_device_add(HalDevice *parent, di_node_t node, char *devfs_path)
 	devinfo_set_default_properties (d, parent, node, devfs_path);
         hal_device_property_set_string (parent, "info.product", "IDE device");
 	hal_device_property_set_string (parent, "info.subsystem", "ide");
-	hal_device_property_set_string (parent, "info.bus", "ide");
 	hal_device_property_set_int (parent, "ide.host", 0); /* XXX */
 	hal_device_property_set_int (parent, "ide.channel", 0);
 
@@ -256,7 +254,6 @@ devinfo_scsi_add(HalDevice *parent, di_node_t node, char *devfs_path, char *devi
 
 	devinfo_set_default_properties (d, parent, node, devfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "scsi");
-	hal_device_property_set_string (d, "info.bus", "scsi");
 
         hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
                 "%s/%s%d", hal_device_get_udi (parent), di_node_name(node), di_instance (node));
@@ -544,7 +541,6 @@ devinfo_lofi_add_major(HalDevice *parent, di_node_t node, char *devfs_path, char
 
 		devinfo_set_default_properties (d, parent, node, devfs_path);
 		hal_device_property_set_string (d, "info.subsystem", "pseudo");
-		hal_device_property_set_string (d, "info.bus", "pseudo");
 
         	hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
                 	"%s/%s%d", hal_device_get_udi (parent), di_node_name(node), di_instance (node));
diff --git a/hald/solaris/devinfo_usb.c b/hald/solaris/devinfo_usb.c
index 2f82e2b..b0be81d 100644
--- a/hald/solaris/devinfo_usb.c
+++ b/hald/solaris/devinfo_usb.c
@@ -67,7 +67,6 @@ devinfo_usb_add(HalDevice *parent, di_node_t node, char *devfs_path, char *devic
 
 	devinfo_set_default_properties (d, parent, node, devfs_path);
 	hal_device_property_set_string (d, "info.subsystem", "usb_device");
-	hal_device_property_set_string (d, "info.bus", "usb_device");
 	PROP_STR(d, node, s, "usb-product-name", "info.product");
 	PROP_STR(d, node, s, "usb-product-name", "usb_device.product");
 	PROP_STR(d, node, s, "usb-vendor-name", "usb_device.vendor");
@@ -119,7 +118,6 @@ devinfo_usb_if_add(HalDevice *parent, di_node_t node, gchar *devfs_path, int ifn
 
 	devinfo_set_default_properties (d, parent, node, devfs_path);
         hal_device_property_set_string (d, "info.subsystem", "usb");
-        hal_device_property_set_string (d, "info.bus", "usb");
 
         hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
 		"%s_if%d", hal_device_get_udi (parent), ifnum);

More information about the hal-commit mailing list