From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 7 Dec 2012 01:01:25 +0000 (+1000)
Subject: drm/nouveau/bios: rename DCB_GPIO_PWM_FAN to DCB_GPIO_FAN
X-Git-Tag: firefly_0821_release~3680^2~1036^2~10^2~63
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e8c3cc0803b7f70f2f96d3bae3c4a4ac5238ed10;p=firefly-linux-kernel-4.4.55.git

drm/nouveau/bios: rename DCB_GPIO_PWM_FAN to DCB_GPIO_FAN

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h b/drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h
index 94e540e10567..cb060576c20e 100644
--- a/drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h
+++ b/drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h
@@ -5,7 +5,7 @@ enum dcb_gpio_func_name {
 	DCB_GPIO_PANEL_POWER = 0x01,
 	DCB_GPIO_TVDAC0 = 0x0c,
 	DCB_GPIO_TVDAC1 = 0x2d,
-	DCB_GPIO_PWM_FAN = 0x09,
+	DCB_GPIO_FAN = 0x09,
 	DCB_GPIO_FAN_SENSE = 0x3d,
 	DCB_GPIO_UNUSED = 0xff
 };
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c b/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
index f7d32f49f657..edc1664ee54f 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
@@ -213,7 +213,7 @@ nouveau_therm_fan_ctor(struct nouveau_therm *therm)
 	int ret;
 
 	/* attempt to locate a drivable fan, and determine control method */
-	ret = gpio->find(gpio, 0, DCB_GPIO_PWM_FAN, 0xff, &func);
+	ret = gpio->find(gpio, 0, DCB_GPIO_FAN, 0xff, &func);
 	if (ret == 0)
 		ret = nouveau_fanpwm_create(therm, &func);
 	if (ret != 0)
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c b/drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c
index 7e50f1419ac6..e0693e0109e8 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c
@@ -53,8 +53,8 @@ nouveau_fantog_update(struct nouveau_fantog_priv *priv, int percent)
 		percent = priv->percent;
 	priv->percent = percent;
 
-	duty = !gpio->get(gpio, 0, DCB_GPIO_PWM_FAN, 0xff);
-	gpio->set(gpio, 0, DCB_GPIO_PWM_FAN, 0xff, duty);
+	duty = !gpio->get(gpio, 0, DCB_GPIO_FAN, 0xff);
+	gpio->set(gpio, 0, DCB_GPIO_FAN, 0xff, duty);
 
 	if (list_empty(&priv->alarm.head) && percent != (duty * 100)) {
 		u64 next_change = (percent * priv->period_us) / 100;