drm/nouveau: Misc cleanup of the PM code.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index 85a56dea0ef76e5d5751444f8cd20432b75bba64..b1d3f4b26ebd61291bbf6fab7b04c16b701a3765 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
@@ -227,8 +227,8 @@ nouveau_pm_set_perflvl(struct device *d, struct device_attribute *a,
        return strlen(buf);
 }
 
-DEVICE_ATTR(performance_level, S_IRUGO | S_IWUSR,
-           nouveau_pm_get_perflvl, nouveau_pm_set_perflvl);
+static DEVICE_ATTR(performance_level, S_IRUGO | S_IWUSR,
+                  nouveau_pm_get_perflvl, nouveau_pm_set_perflvl);
 
 static int
 nouveau_sysfs_init(struct drm_device *dev)
@@ -283,8 +283,6 @@ nouveau_sysfs_fini(struct drm_device *dev)
        }
 }
 
-
-
 static ssize_t
 nouveau_hwmon_show_temp(struct device *d, struct device_attribute *a, char *buf)
 {
@@ -317,7 +315,7 @@ nouveau_hwmon_set_max_temp(struct device *d, struct device_attribute *a,
        struct nouveau_pm_threshold_temp *temp = &pm->threshold_temp;
        long value;
 
-       if (strict_strtoul(buf, 10, &value) == -EINVAL)
+       if (strict_strtol(buf, 10, &value) == -EINVAL)
                return count;
 
        temp->down_clock = value/1000;
@@ -352,7 +350,7 @@ nouveau_hwmon_set_critical_temp(struct device *d, struct device_attribute *a,
        struct nouveau_pm_threshold_temp *temp = &pm->threshold_temp;
        long value;
 
-       if (strict_strtoul(buf, 10, &value) == -EINVAL)
+       if (strict_strtol(buf, 10, &value) == -EINVAL)
                return count;
 
        temp->critical = value/1000;

diff --git a/drivers/gpu/drm/nouveau/nouveau_temp.c b/drivers/gpu/drm/nouveau/nouveau_temp.c
index f9eda87d1773bde7e2bd81473a44e907e70a3038..16bbbf1eff63bc5ef37038e37d85fccc7f407a8d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_temp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_temp.c
@@ -27,7 +27,7 @@
 #include "nouveau_drv.h"
 #include "nouveau_pm.h"
 
-void
+static void
 nouveau_temp_vbios_parse(struct drm_device *dev, u8 *temp)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;

diff --git a/drivers/gpu/drm/nouveau/nv04_pm.c b/drivers/gpu/drm/nouveau/nv04_pm.c
index 15e4b9029df8569705f0046c33e6ca5546f2dc83..61ca92744f93a231b78814b2e16272182c53cc93 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv04_pm.c
+++ b/drivers/gpu/drm/nouveau/nv04_pm.c
@@ -25,6 +25,7 @@
 #include "drmP.h"
 #include "nouveau_drv.h"
 #include "nouveau_hw.h"
+#include "nouveau_pm.h"
 
 struct nv04_pm_state {
        struct pll_lims pll;