summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-12-06 15:13:06 +1000
committerBen Skeggs <bskeggs@redhat.com>2013-02-20 16:00:25 +1000
commitb2c36312c9532491ca38275c3862e5c5dfac6033 (patch)
tree46e8c040eee49e417723fef7895f064a01f68b76
parent1a22274b28fd47514f1463051d93028ad5f54af6 (diff)
drm/nouveau/hwmon: s/fan0/fan1/
Fan speed info now shown by sensors. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--Documentation/thermal/nouveau_thermal2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_pm.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/thermal/nouveau_thermal b/Documentation/thermal/nouveau_thermal
index ec854fd3205..efceb7828f5 100644
--- a/Documentation/thermal/nouveau_thermal
+++ b/Documentation/thermal/nouveau_thermal
@@ -58,7 +58,7 @@ attributes should be available:
You may also have the following attribute:
- * fan0_input: Speed in RPM of your fan.
+ * fan1_input: Speed in RPM of your fan.
Your fan can be driven in different modes:
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index d456e102682..3a6ee7e4875 100644
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
@@ -698,7 +698,7 @@ static SENSOR_DEVICE_ATTR(update_rate, S_IRUGO,
NULL, 0);
static ssize_t
-nouveau_hwmon_show_fan0_input(struct device *d, struct device_attribute *attr,
+nouveau_hwmon_show_fan1_input(struct device *d, struct device_attribute *attr,
char *buf)
{
struct drm_device *dev = dev_get_drvdata(d);
@@ -707,7 +707,7 @@ nouveau_hwmon_show_fan0_input(struct device *d, struct device_attribute *attr,
return snprintf(buf, PAGE_SIZE, "%d\n", therm->fan_sense(therm));
}
-static SENSOR_DEVICE_ATTR(fan0_input, S_IRUGO, nouveau_hwmon_show_fan0_input,
+static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, nouveau_hwmon_show_fan1_input,
NULL, 0);
static ssize_t
@@ -887,7 +887,7 @@ static struct attribute *hwmon_attributes[] = {
NULL
};
static struct attribute *hwmon_fan_rpm_attributes[] = {
- &sensor_dev_attr_fan0_input.dev_attr.attr,
+ &sensor_dev_attr_fan1_input.dev_attr.attr,
NULL
};
static struct attribute *hwmon_pwm_fan_attributes[] = {