diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-12-06 00:13:06 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2013-02-20 01:00:25 -0500 |
commit | b2c36312c9532491ca38275c3862e5c5dfac6033 (patch) | |
tree | 46e8c040eee49e417723fef7895f064a01f68b76 | |
parent | 1a22274b28fd47514f1463051d93028ad5f54af6 (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_thermal | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_pm.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/thermal/nouveau_thermal b/Documentation/thermal/nouveau_thermal index ec854fd32057..efceb7828f54 100644 --- a/Documentation/thermal/nouveau_thermal +++ b/Documentation/thermal/nouveau_thermal | |||
@@ -58,7 +58,7 @@ attributes should be available: | |||
58 | 58 | ||
59 | You may also have the following attribute: | 59 | You may also have the following attribute: |
60 | 60 | ||
61 | * fan0_input: Speed in RPM of your fan. | 61 | * fan1_input: Speed in RPM of your fan. |
62 | 62 | ||
63 | Your fan can be driven in different modes: | 63 | Your fan can be driven in different modes: |
64 | 64 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c index d456e102682b..3a6ee7e48753 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, | |||
698 | NULL, 0); | 698 | NULL, 0); |
699 | 699 | ||
700 | static ssize_t | 700 | static ssize_t |
701 | nouveau_hwmon_show_fan0_input(struct device *d, struct device_attribute *attr, | 701 | nouveau_hwmon_show_fan1_input(struct device *d, struct device_attribute *attr, |
702 | char *buf) | 702 | char *buf) |
703 | { | 703 | { |
704 | struct drm_device *dev = dev_get_drvdata(d); | 704 | struct drm_device *dev = dev_get_drvdata(d); |
@@ -707,7 +707,7 @@ nouveau_hwmon_show_fan0_input(struct device *d, struct device_attribute *attr, | |||
707 | 707 | ||
708 | return snprintf(buf, PAGE_SIZE, "%d\n", therm->fan_sense(therm)); | 708 | return snprintf(buf, PAGE_SIZE, "%d\n", therm->fan_sense(therm)); |
709 | } | 709 | } |
710 | static SENSOR_DEVICE_ATTR(fan0_input, S_IRUGO, nouveau_hwmon_show_fan0_input, | 710 | static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, nouveau_hwmon_show_fan1_input, |
711 | NULL, 0); | 711 | NULL, 0); |
712 | 712 | ||
713 | static ssize_t | 713 | static ssize_t |
@@ -887,7 +887,7 @@ static struct attribute *hwmon_attributes[] = { | |||
887 | NULL | 887 | NULL |
888 | }; | 888 | }; |
889 | static struct attribute *hwmon_fan_rpm_attributes[] = { | 889 | static struct attribute *hwmon_fan_rpm_attributes[] = { |
890 | &sensor_dev_attr_fan0_input.dev_attr.attr, | 890 | &sensor_dev_attr_fan1_input.dev_attr.attr, |
891 | NULL | 891 | NULL |
892 | }; | 892 | }; |
893 | static struct attribute *hwmon_pwm_fan_attributes[] = { | 893 | static struct attribute *hwmon_pwm_fan_attributes[] = { |