Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b54262f3 authored by Martin Peres's avatar Martin Peres Committed by Ben Skeggs
Browse files

drm/nouveau: Fix compilation issues in nouveau_pm when CONFIG_HWMON is not set 



Signed-off-by: default avatarMartin Peres <martin.peres@ensi-bourges.fr>
Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 84b8081c

drivers/gpu/drm/nouveau/nouveau_pm.c

+6 −1
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ nouveau_sysfs_fini(struct drm_device *dev) 
	}

}



#ifdef CONFIG_HWMON

static ssize_t

nouveau_hwmon_show_temp(struct device *d, struct device_attribute *a, char *buf)

{
@@ -395,10 +396,12 @@ static struct attribute *hwmon_attributes[] = { 
static const struct attribute_group hwmon_attrgroup = {

	.attrs = hwmon_attributes,

};

#endif



static int

nouveau_hwmon_init(struct drm_device *dev)

{

#ifdef CONFIG_HWMON

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_pm_engine *pm = &dev_priv->engine.pm;

	struct device *hwmon_dev;
@@ -425,13 +428,14 @@ nouveau_hwmon_init(struct drm_device *dev) 
	}



	pm->hwmon = hwmon_dev;



#endif

	return 0;

}



static void

nouveau_hwmon_fini(struct drm_device *dev)

{

#ifdef CONFIG_HWMON

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_pm_engine *pm = &dev_priv->engine.pm;
@@ -439,6 +443,7 @@ nouveau_hwmon_fini(struct drm_device *dev) 
		sysfs_remove_group(&pm->hwmon->kobj, &hwmon_attrgroup);

		hwmon_device_unregister(pm->hwmon);

	}

#endif

}



int