Changeset 4267

Timestamp:

12/21/06 09:24:01 (6 years ago)

Author:

khali

Message:

libsensors: Get the i2c adapter names from the class device's "name"
attribute, falling back to the device's "name" attribute for
compatibility only. This change is needed to match ongoing cleanups in
Linux 2.6's i2c-core. i2c adapters will soon be class devices only, the
legacy i2c_adapter devices and driver are being removed.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• lib/sysfs.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -13 +13 @@
            Add f71872f support
            Add w83627dhg support (David Holl, #2157)
+           Get the i2c adapter names from classdev.name
   Man page i2cdetect.8: Describe the output convention
   Man page sensors.1: Update (option -c) and clean up

lm-sensors/trunk/lib/sysfs.c

@@ -198 +198 @@
                 if (!(dev = sysfs_get_classdev_device(clsdev)))
                         continue;
-                if (!(attr = sysfs_get_device_attr(dev, "name")))
+                /* Get the adapter name from the classdev "name" attribute
+                 * (Linux 2.6.20 and later). If it fails, fall back to
+                 * the device "name" attribute (for older kernels). */
+                if (!(attr = sysfs_get_classdev_attr(clsdev, "name"))
+                 && !(attr = sysfs_get_device_attr(dev, "name")))
                         continue;