Merge tag 'topic/iomem-mmap-vs-gup-2021-02-22' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / drivers / thermal / thermal_sysfs.c

diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index 0866e94..345917a 100644 (file)
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -216,49 +216,6 @@ trip_point_hyst_show(struct device *dev, struct device_attribute *attr,
        return ret ? ret : sprintf(buf, "%d\n", temperature);
 }
 
-static ssize_t
-passive_store(struct device *dev, struct device_attribute *attr,
-             const char *buf, size_t count)
-{
-       struct thermal_zone_device *tz = to_thermal_zone(dev);
-       int state;
-
-       if (sscanf(buf, "%d\n", &state) != 1)
-               return -EINVAL;
-
-       /* sanity check: values below 1000 millicelcius don't make sense
-        * and can cause the system to go into a thermal heart attack
-        */
-       if (state && state < 1000)
-               return -EINVAL;
-
-       if (state && !tz->forced_passive) {
-               if (!tz->passive_delay)
-                       tz->passive_delay = 1000;
-               thermal_zone_device_rebind_exception(tz, "Processor",
-                                                    sizeof("Processor"));
-       } else if (!state && tz->forced_passive) {
-               tz->passive_delay = 0;
-               thermal_zone_device_unbind_exception(tz, "Processor",
-                                                    sizeof("Processor"));
-       }
-
-       tz->forced_passive = state;
-
-       thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
-
-       return count;
-}
-
-static ssize_t
-passive_show(struct device *dev, struct device_attribute *attr,
-            char *buf)
-{
-       struct thermal_zone_device *tz = to_thermal_zone(dev);
-
-       return sprintf(buf, "%d\n", tz->forced_passive);
-}
-
 static ssize_t
 policy_store(struct device *dev, struct device_attribute *attr,
             const char *buf, size_t count)
@@ -403,7 +360,6 @@ static DEVICE_ATTR_RW(sustainable_power);
 
 /* These thermal zone device attributes are created based on conditions */
 static DEVICE_ATTR_RW(mode);
-static DEVICE_ATTR_RW(passive);
 
 /* These attributes are unconditionally added to a thermal zone */
 static struct attribute *thermal_zone_dev_attrs[] = {
@@ -438,45 +394,9 @@ static const struct attribute_group thermal_zone_mode_attribute_group = {
        .attrs = thermal_zone_mode_attrs,
 };
 
-/* We expose passive only if passive trips are present */
-static struct attribute *thermal_zone_passive_attrs[] = {
-       &dev_attr_passive.attr,
-       NULL,
-};
-
-static umode_t thermal_zone_passive_is_visible(struct kobject *kobj,
-                                              struct attribute *attr,
-                                              int attrno)
-{
-       struct device *dev = kobj_to_dev(kobj);
-       struct thermal_zone_device *tz;
-       enum thermal_trip_type trip_type;
-       int count, passive = 0;
-
-       tz = container_of(dev, struct thermal_zone_device, device);
-
-       for (count = 0; count < tz->trips && !passive; count++) {
-               tz->ops->get_trip_type(tz, count, &trip_type);
-
-               if (trip_type == THERMAL_TRIP_PASSIVE)
-                       passive = 1;
-       }
-
-       if (!passive)
-               return attr->mode;
-
-       return 0;
-}
-
-static const struct attribute_group thermal_zone_passive_attribute_group = {
-       .attrs = thermal_zone_passive_attrs,
-       .is_visible = thermal_zone_passive_is_visible,
-};
-
 static const struct attribute_group *thermal_zone_attribute_groups[] = {
        &thermal_zone_attribute_group,
        &thermal_zone_mode_attribute_group,
-       &thermal_zone_passive_attribute_group,
        /* This is not NULL terminated as we create the group dynamically */
 };
 
@@ -955,10 +875,7 @@ trip_point_show(struct device *dev, struct device_attribute *attr, char *buf)
        instance =
            container_of(attr, struct thermal_instance, attr);
 
-       if (instance->trip == THERMAL_TRIPS_NONE)
-               return sprintf(buf, "-1\n");
-       else
-               return sprintf(buf, "%d\n", instance->trip);
+       return sprintf(buf, "%d\n", instance->trip);
 }
 
 ssize_t