drm: nouveau: Fix build warning seen is HWMON is undefined

PATCH Superseded Guenter Roeck 1 participant 1 message Oct 5, 2012

Subsystems (3)

DRM drivers DRM misc nouveau

lore

Share & tools

lore

Guenter Roeck

author

2012-10-05 15:58 UTC #0 lore raw

PATCH 1/1 drm: nouveau: Fix build warning seen is HWMON is undefined

Fix:

nouveau_pm.c: In function ‘nouveau_hwmon_init’:
nouveau_pm.c:703:24: warning: unused variable ‘therm’ [-Wunused-variable]

Signed-off-by Guenter Roeck <[email protected]>

---
This was seen in the latest upstream kernel.

 drivers/gpu/drm/nouveau/nouveau_pm.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/gpu/drm/nouveau/nouveau_pm.c +2 -2

index 0bf64c9..90dc63e 100644
@@ -699,10 +699,10 @@ static int
 nouveau_hwmon_init(struct drm_device *dev)
 {
 	struct nouveau_pm *pm = nouveau_pm(dev);
-	struct nouveau_drm *drm = nouveau_drm(dev);
-	struct nouveau_therm *therm = nouveau_therm(drm->device);
 
 #if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE))
+	struct nouveau_drm *drm = nouveau_drm(dev);
+	struct nouveau_therm *therm = nouveau_therm(drm->device);
 	struct device *hwmon_dev;
 	int ret = 0;

Signature · 1 line

1.7.9.7