Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / drivers / thermal / thermal_sysfs.c

diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index 1c4aac8464a709d3fb01f667daab973a7cace8b2..5018459e8dd94035248018fe883f085990f9cc3e 100644 (file)
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -416,15 +416,15 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask)
        int indx;
 
        /* This function works only for zones with at least one trip */
-       if (tz->trips <= 0)
+       if (tz->num_trips <= 0)
                return -EINVAL;
 
-       tz->trip_type_attrs = kcalloc(tz->trips, sizeof(*tz->trip_type_attrs),
+       tz->trip_type_attrs = kcalloc(tz->num_trips, sizeof(*tz->trip_type_attrs),
                                      GFP_KERNEL);
        if (!tz->trip_type_attrs)
                return -ENOMEM;
 
-       tz->trip_temp_attrs = kcalloc(tz->trips, sizeof(*tz->trip_temp_attrs),
+       tz->trip_temp_attrs = kcalloc(tz->num_trips, sizeof(*tz->trip_temp_attrs),
                                      GFP_KERNEL);
        if (!tz->trip_temp_attrs) {
                kfree(tz->trip_type_attrs);
@@ -432,7 +432,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask)
        }
 
        if (tz->ops->get_trip_hyst) {
-               tz->trip_hyst_attrs = kcalloc(tz->trips,
+               tz->trip_hyst_attrs = kcalloc(tz->num_trips,
                                              sizeof(*tz->trip_hyst_attrs),
                                              GFP_KERNEL);
                if (!tz->trip_hyst_attrs) {
@@ -442,7 +442,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask)
                }
        }
 
-       attrs = kcalloc(tz->trips * 3 + 1, sizeof(*attrs), GFP_KERNEL);
+       attrs = kcalloc(tz->num_trips * 3 + 1, sizeof(*attrs), GFP_KERNEL);
        if (!attrs) {
                kfree(tz->trip_type_attrs);
                kfree(tz->trip_temp_attrs);
@@ -451,7 +451,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask)
                return -ENOMEM;
        }
 
-       for (indx = 0; indx < tz->trips; indx++) {
+       for (indx = 0; indx < tz->num_trips; indx++) {
                /* create trip type attribute */
                snprintf(tz->trip_type_attrs[indx].name, THERMAL_NAME_LENGTH,
                         "trip_point_%d_type", indx);
@@ -478,7 +478,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask)
                        tz->trip_temp_attrs[indx].attr.store =
                                                        trip_point_temp_store;
                }
-               attrs[indx + tz->trips] = &tz->trip_temp_attrs[indx].attr.attr;
+               attrs[indx + tz->num_trips] = &tz->trip_temp_attrs[indx].attr.attr;
 
                /* create Optional trip hyst attribute */
                if (!tz->ops->get_trip_hyst)
@@ -496,10 +496,10 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask)
                        tz->trip_hyst_attrs[indx].attr.store =
                                        trip_point_hyst_store;
                }
-               attrs[indx + tz->trips * 2] =
+               attrs[indx + tz->num_trips * 2] =
                                        &tz->trip_hyst_attrs[indx].attr.attr;
        }
-       attrs[tz->trips * 3] = NULL;
+       attrs[tz->num_trips * 3] = NULL;
 
        tz->trips_attribute_group.attrs = attrs;
 
@@ -540,7 +540,7 @@ int thermal_zone_create_device_groups(struct thermal_zone_device *tz,
        for (i = 0; i < size - 2; i++)
                groups[i] = thermal_zone_attribute_groups[i];
 
-       if (tz->trips) {
+       if (tz->num_trips) {
                result = create_trip_attrs(tz, mask);
                if (result) {
                        kfree(groups);
@@ -561,7 +561,7 @@ void thermal_zone_destroy_device_groups(struct thermal_zone_device *tz)
        if (!tz)
                return;
 
-       if (tz->trips)
+       if (tz->num_trips)
                destroy_trip_attrs(tz);
 
        kfree(tz->device.groups);