hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau/pm: remove defunct fanspeed_set/get from pm table 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2011-09-17 06:38:56 +10:00
parent 6934618014
commit 1e05415733
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nouveau_drv.h
View File

@ -556,8 +556,6 @@ struct nouveau_pm_engine {
int (*voltage_set)(struct drm_device *, int voltage);
int (*pwm_get)(struct drm_device *, struct dcb_gpio_entry*, u32*, u32*);
int (*pwm_set)(struct drm_device *, struct dcb_gpio_entry*, u32, u32);
int (*fanspeed_get)(struct drm_device *);
int (*fanspeed_set)(struct drm_device *, int fanspeed);
int (*temp_get)(struct drm_device *);
};

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

@ -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) {