leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Martin Peres <martin.peres@ensi-bourges.fr>
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Martin Peres 2010-10-26 12:48:28 +02:00 committed by Ben Skeggs
parent 84b8081c2b
commit b54262f3c8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,6 +284,7 @@ nouveau_sysfs_fini(struct drm_device *dev)
} }
} }
#ifdef CONFIG_HWMON
static ssize_t static ssize_t
nouveau_hwmon_show_temp(struct device *d, struct device_attribute *a, char *buf) 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 = { static const struct attribute_group hwmon_attrgroup = {
.attrs = hwmon_attributes, .attrs = hwmon_attributes,
}; };
#endif
static int static int
nouveau_hwmon_init(struct drm_device *dev) nouveau_hwmon_init(struct drm_device *dev)
{ {
#ifdef CONFIG_HWMON
struct drm_nouveau_private *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_pm_engine *pm = &dev_priv->engine.pm; struct nouveau_pm_engine *pm = &dev_priv->engine.pm;
struct device *hwmon_dev; struct device *hwmon_dev;
@ -425,13 +428,14 @@ nouveau_hwmon_init(struct drm_device *dev)
} }
pm->hwmon = hwmon_dev; pm->hwmon = hwmon_dev;
#endif
return 0; return 0;
} }
static void static void
nouveau_hwmon_fini(struct drm_device *dev) nouveau_hwmon_fini(struct drm_device *dev)
{ {
#ifdef CONFIG_HWMON
struct drm_nouveau_private *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_pm_engine *pm = &dev_priv->engine.pm; 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); sysfs_remove_group(&pm->hwmon->kobj, &hwmon_attrgroup);
hwmon_device_unregister(pm->hwmon); hwmon_device_unregister(pm->hwmon);
} }
#endif
} }
int int