diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-11-21 15:28:28 +0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 13:01:44 +0400 |
| commit | 675aac033e089833e763ea4fbabae66883d10574 (patch) | |
| tree | 69e16cb4743d72b36d54bcffa57bf06b9eb449cc /drivers/gpu/drm/nouveau/nv50_pm.c | |
| parent | c8b9641a9146b13d34824f99c3d22c8c0c3a06bd (diff) | |
| download | linux-675aac033e089833e763ea4fbabae66883d10574.tar.xz | |
drm/nouveau: just pass gpio line to pwm_*, not entire gpio struct
We don't need more than the line id to determine the PWM controller, and
the GPIO interfaces are about to change somewhat.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_pm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_pm.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c b/drivers/gpu/drm/nouveau/nv50_pm.c index fce1214c3db1..03937212e9d8 100644 --- a/drivers/gpu/drm/nouveau/nv50_pm.c +++ b/drivers/gpu/drm/nouveau/nv50_pm.c @@ -715,25 +715,24 @@ resume: } static int -pwm_info(struct drm_device *dev, struct dcb_gpio_entry *gpio, - int *ctrl, int *line, int *indx) +pwm_info(struct drm_device *dev, int *line, int *ctrl, int *indx) { - if (gpio->line == 0x04) { + if (*line == 0x04) { *ctrl = 0x00e100; *line = 4; *indx = 0; } else - if (gpio->line == 0x09) { + if (*line == 0x09) { *ctrl = 0x00e100; *line = 9; *indx = 1; } else - if (gpio->line == 0x10) { + if (*line == 0x10) { *ctrl = 0x00e28c; *line = 0; *indx = 0; } else { - NV_ERROR(dev, "unknown pwm ctrl for gpio %d\n", gpio->line); + NV_ERROR(dev, "unknown pwm ctrl for gpio %d\n", *line); return -ENODEV; } @@ -741,10 +740,9 @@ pwm_info(struct drm_device *dev, struct dcb_gpio_entry *gpio, } int -nv50_pm_pwm_get(struct drm_device *dev, struct dcb_gpio_entry *gpio, - u32 *divs, u32 *duty) +nv50_pm_pwm_get(struct drm_device *dev, int line, u32 *divs, u32 *duty) { - int ctrl, line, id, ret = pwm_info(dev, gpio, &ctrl, &line, &id); + int ctrl, id, ret = pwm_info(dev, &line, &ctrl, &id); if (ret) return ret; @@ -758,10 +756,9 @@ nv50_pm_pwm_get(struct drm_device *dev, struct dcb_gpio_entry *gpio, } int -nv50_pm_pwm_set(struct drm_device *dev, struct dcb_gpio_entry *gpio, - u32 divs, u32 duty) +nv50_pm_pwm_set(struct drm_device *dev, int line, u32 divs, u32 duty) { - int ctrl, line, id, ret = pwm_info(dev, gpio, &ctrl, &line, &id); + int ctrl, id, ret = pwm_info(dev, &line, &ctrl, &id); if (ret) return ret; |