iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/nouveau/hwmon: s/fan0/fan1/

Browse Source 
Fan speed info now shown by sensors.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2012-12-06 15:13:06 +10:00
parent 1a22274b28
commit b2c36312c9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/thermal/nouveau_thermal
View File

@ -58,7 +58,7 @@ attributes should be available:
You may also have the following attribute: 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: Your fan can be driven in different modes:

6
drivers/gpu/drm/nouveau/nouveau_pm.c
View File

@ -698,7 +698,7 @@ static SENSOR_DEVICE_ATTR(update_rate, S_IRUGO,
NULL, 0); NULL, 0);
static ssize_t 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) char *buf)
{ {
struct drm_device *dev = dev_get_drvdata(d); 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)); 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); NULL, 0);
static ssize_t static ssize_t
@ -887,7 +887,7 @@ static struct attribute *hwmon_attributes[] = {
NULL NULL
}; };
static struct attribute *hwmon_fan_rpm_attributes[] = { static struct attribute *hwmon_fan_rpm_attributes[] = {
&sensor_dev_attr_fan0_input.dev_attr.attr, &sensor_dev_attr_fan1_input.dev_attr.attr,
NULL NULL
}; };
static struct attribute *hwmon_pwm_fan_attributes[] = { static struct attribute *hwmon_pwm_fan_attributes[] = {