summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_pm.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-09-17 06:38:56 +1000
committerBen Skeggs <bskeggs@redhat.com>2011-12-21 19:01:13 +1000
commit1e05415733b0d4668fbce92856fafabfa1a33333 (patch)
tree1202a46d85e0f5d14e64796d02b9c3dead452c8f /drivers/gpu/drm/nouveau/nouveau_pm.c
parent693461801464eb65eb779261b3d9d80dc9131f81 (diff)
drm/nouveau/pm: remove defunct fanspeed_set/get from pm table
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_pm.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_pm.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index b94364dbe35..3ebc3f575c5 100644
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
@@ -40,15 +40,12 @@ nouveau_pwmfan_get(struct drm_device *dev)
struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_gpio_engine *pgpio = &dev_priv->engine.gpio;
struct nouveau_pm_engine *pm = &dev_priv->engine.pm;
- struct dcb_gpio_entry *gpio;
+ struct dcb_gpio_entry *gpio = NULL;
u32 divs, duty;
int ret;
- if (!pm->pwm_get) {
- if (pm->fanspeed_get)
- return pm->fanspeed_get(dev);
+ if (!pm->pwm_get)
return -ENODEV;
- }
gpio = nouveau_bios_gpio_entry(dev, DCB_GPIO_PWM_FAN);
if (gpio) {
@@ -75,11 +72,8 @@ nouveau_pwmfan_set(struct drm_device *dev, int percent)
struct dcb_gpio_entry *gpio;
u32 divs, duty;
- if (!pm->pwm_set) {
- if (pm->fanspeed_set)
- return pm->fanspeed_set(dev, percent);
+ if (!pm->pwm_set)
return -ENODEV;
- }
gpio = nouveau_bios_gpio_entry(dev, DCB_GPIO_PWM_FAN);
if (gpio) {