Changeset 4835

Timestamp:

09/23/07 14:06:51 (6 years ago)

Author:

khali

Message:

sensors_get_all_features has a single caller now, so fold
it thereinto.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/lib/access.c (modified) (3 diffs)

lm-sensors/branches/lm-sensors-3.0.0/lib/access.c

@@ -331 +331 @@
 }
 
-static const sensors_subfeature *
-sensors_get_all_features(const sensors_chip_name *name, int *nr)
-{
-        sensors_subfeature *subfeature_list;
-        int i;
-
-        for (i = 0; i < sensors_proc_chips_count; i++)
-                if (sensors_match_chip(&sensors_proc_chips[i].chip, name)) {
-                        subfeature_list = sensors_proc_chips[i].subfeature;
-                        if (*nr >= sensors_proc_chips[i].subfeature_count)
-                                return NULL;
-                        return &subfeature_list[(*nr)++];
-                }
-        return NULL;
-}
-
 const sensors_feature *
 sensors_get_features(const sensors_chip_name *name, int *nr)
@@ -371 +355 @@
 {
         const sensors_subfeature *subfeature;
+        int i;
 
         /* Seek directly to the first subfeature */
@@ -376 +361 @@
                 *nr = feature->first_subfeature;
 
-        subfeature = sensors_get_all_features(name, nr);
-        if (!subfeature)
-                return NULL;    /* end of list */
-        if (subfeature->number == feature->first_subfeature ||
-            subfeature->mapping == feature->first_subfeature)
-                return subfeature;
-        return NULL;            /* end of subfeature list */
+        for (i = 0; i < sensors_proc_chips_count; i++)
+                if (sensors_match_chip(&sensors_proc_chips[i].chip, name)) {
+                        if (*nr >= sensors_proc_chips[i].subfeature_count)
+                                return NULL;    /* end of list */
+                        subfeature = &sensors_proc_chips[i].subfeature[(*nr)++];
+                        if (subfeature->number == feature->first_subfeature ||
+                            subfeature->mapping == feature->first_subfeature)
+                                return subfeature;
+                        return NULL;    /* end of subfeature list */
+                }
+        return NULL;            /* no matching chip */
 }