diff options
author | Martin Peres <martin.peres@labri.fr> | 2012-09-04 07:39:40 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-02 23:13:15 -0400 |
commit | c9cbf135065c0a674d43451127a10e48a53f9054 (patch) | |
tree | 13a37167a51a6d1be6f230e261715da34cc541c2 /drivers/gpu/drm | |
parent | cfc732bbc59d8905634fef7d7b02bdac84ea9221 (diff) |
drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon's rules
This was reported by tizbac on IRC.
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_pm.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c index 8317e82b86ce..0dca191ee173 100644 --- a/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/drivers/gpu/drm/nouveau/nouveau_pm.c | |||
@@ -504,7 +504,7 @@ static SENSOR_DEVICE_ATTR(fan0_input, S_IRUGO, nouveau_hwmon_show_fan0_input, | |||
504 | NULL, 0); | 504 | NULL, 0); |
505 | 505 | ||
506 | static ssize_t | 506 | static ssize_t |
507 | nouveau_hwmon_get_pwm0(struct device *d, struct device_attribute *a, char *buf) | 507 | nouveau_hwmon_get_pwm1(struct device *d, struct device_attribute *a, char *buf) |
508 | { | 508 | { |
509 | struct drm_device *dev = dev_get_drvdata(d); | 509 | struct drm_device *dev = dev_get_drvdata(d); |
510 | struct nouveau_drm *drm = nouveau_drm(dev); | 510 | struct nouveau_drm *drm = nouveau_drm(dev); |
@@ -519,7 +519,7 @@ nouveau_hwmon_get_pwm0(struct device *d, struct device_attribute *a, char *buf) | |||
519 | } | 519 | } |
520 | 520 | ||
521 | static ssize_t | 521 | static ssize_t |
522 | nouveau_hwmon_set_pwm0(struct device *d, struct device_attribute *a, | 522 | nouveau_hwmon_set_pwm1(struct device *d, struct device_attribute *a, |
523 | const char *buf, size_t count) | 523 | const char *buf, size_t count) |
524 | { | 524 | { |
525 | struct drm_device *dev = dev_get_drvdata(d); | 525 | struct drm_device *dev = dev_get_drvdata(d); |
@@ -541,12 +541,12 @@ nouveau_hwmon_set_pwm0(struct device *d, struct device_attribute *a, | |||
541 | return count; | 541 | return count; |
542 | } | 542 | } |
543 | 543 | ||
544 | static SENSOR_DEVICE_ATTR(pwm0, S_IRUGO | S_IWUSR, | 544 | static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, |
545 | nouveau_hwmon_get_pwm0, | 545 | nouveau_hwmon_get_pwm1, |
546 | nouveau_hwmon_set_pwm0, 0); | 546 | nouveau_hwmon_set_pwm1, 0); |
547 | 547 | ||
548 | static ssize_t | 548 | static ssize_t |
549 | nouveau_hwmon_get_pwm0_min(struct device *d, | 549 | nouveau_hwmon_get_pwm1_min(struct device *d, |
550 | struct device_attribute *a, char *buf) | 550 | struct device_attribute *a, char *buf) |
551 | { | 551 | { |
552 | struct drm_device *dev = dev_get_drvdata(d); | 552 | struct drm_device *dev = dev_get_drvdata(d); |
@@ -562,7 +562,7 @@ nouveau_hwmon_get_pwm0_min(struct device *d, | |||
562 | } | 562 | } |
563 | 563 | ||
564 | static ssize_t | 564 | static ssize_t |
565 | nouveau_hwmon_set_pwm0_min(struct device *d, struct device_attribute *a, | 565 | nouveau_hwmon_set_pwm1_min(struct device *d, struct device_attribute *a, |
566 | const char *buf, size_t count) | 566 | const char *buf, size_t count) |
567 | { | 567 | { |
568 | struct drm_device *dev = dev_get_drvdata(d); | 568 | struct drm_device *dev = dev_get_drvdata(d); |
@@ -581,12 +581,12 @@ nouveau_hwmon_set_pwm0_min(struct device *d, struct device_attribute *a, | |||
581 | return count; | 581 | return count; |
582 | } | 582 | } |
583 | 583 | ||
584 | static SENSOR_DEVICE_ATTR(pwm0_min, S_IRUGO | S_IWUSR, | 584 | static SENSOR_DEVICE_ATTR(pwm1_min, S_IRUGO | S_IWUSR, |
585 | nouveau_hwmon_get_pwm0_min, | 585 | nouveau_hwmon_get_pwm1_min, |
586 | nouveau_hwmon_set_pwm0_min, 0); | 586 | nouveau_hwmon_set_pwm1_min, 0); |
587 | 587 | ||
588 | static ssize_t | 588 | static ssize_t |
589 | nouveau_hwmon_get_pwm0_max(struct device *d, | 589 | nouveau_hwmon_get_pwm1_max(struct device *d, |
590 | struct device_attribute *a, char *buf) | 590 | struct device_attribute *a, char *buf) |
591 | { | 591 | { |
592 | struct drm_device *dev = dev_get_drvdata(d); | 592 | struct drm_device *dev = dev_get_drvdata(d); |
@@ -602,7 +602,7 @@ nouveau_hwmon_get_pwm0_max(struct device *d, | |||
602 | } | 602 | } |
603 | 603 | ||
604 | static ssize_t | 604 | static ssize_t |
605 | nouveau_hwmon_set_pwm0_max(struct device *d, struct device_attribute *a, | 605 | nouveau_hwmon_set_pwm1_max(struct device *d, struct device_attribute *a, |
606 | const char *buf, size_t count) | 606 | const char *buf, size_t count) |
607 | { | 607 | { |
608 | struct drm_device *dev = dev_get_drvdata(d); | 608 | struct drm_device *dev = dev_get_drvdata(d); |
@@ -621,9 +621,9 @@ nouveau_hwmon_set_pwm0_max(struct device *d, struct device_attribute *a, | |||
621 | return count; | 621 | return count; |
622 | } | 622 | } |
623 | 623 | ||
624 | static SENSOR_DEVICE_ATTR(pwm0_max, S_IRUGO | S_IWUSR, | 624 | static SENSOR_DEVICE_ATTR(pwm1_max, S_IRUGO | S_IWUSR, |
625 | nouveau_hwmon_get_pwm0_max, | 625 | nouveau_hwmon_get_pwm1_max, |
626 | nouveau_hwmon_set_pwm0_max, 0); | 626 | nouveau_hwmon_set_pwm1_max, 0); |
627 | 627 | ||
628 | static struct attribute *hwmon_attributes[] = { | 628 | static struct attribute *hwmon_attributes[] = { |
629 | &sensor_dev_attr_temp1_input.dev_attr.attr, | 629 | &sensor_dev_attr_temp1_input.dev_attr.attr, |
@@ -638,9 +638,9 @@ static struct attribute *hwmon_fan_rpm_attributes[] = { | |||
638 | NULL | 638 | NULL |
639 | }; | 639 | }; |
640 | static struct attribute *hwmon_pwm_fan_attributes[] = { | 640 | static struct attribute *hwmon_pwm_fan_attributes[] = { |
641 | &sensor_dev_attr_pwm0.dev_attr.attr, | 641 | &sensor_dev_attr_pwm1.dev_attr.attr, |
642 | &sensor_dev_attr_pwm0_min.dev_attr.attr, | 642 | &sensor_dev_attr_pwm1_min.dev_attr.attr, |
643 | &sensor_dev_attr_pwm0_max.dev_attr.attr, | 643 | &sensor_dev_attr_pwm1_max.dev_attr.attr, |
644 | NULL | 644 | NULL |
645 | }; | 645 | }; |
646 | 646 | ||