[Nouveau] [PATCH] platform: fix compilation error

Alexandre Courbot acourbot at nvidia.com
Tue Aug 12 15:16:53 PDT 2014


nouveau_platform.c was still using the old nouveau_dev() macro,
triggering a compilation error. Fix this.

Signed-off-by: Alexandre Courbot <acourbot at nvidia.com>
---
Hi Ben,

This one should probably go for 3.17 as Linus' tree currently does not
compile if NOUVEAU_PLATFORM is selected. :(

 drm/nouveau_platform.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drm/nouveau_platform.c b/drm/nouveau_platform.c
index 0ffeb50d0088..246a824c16ca 100644
--- a/drm/nouveau_platform.c
+++ b/drm/nouveau_platform.c
@@ -149,7 +149,8 @@ power_down:
 static int nouveau_platform_remove(struct platform_device *pdev)
 {
 	struct drm_device *drm_dev = platform_get_drvdata(pdev);
-	struct nouveau_device *device = nouveau_dev(drm_dev);
+	struct nouveau_drm *drm = nouveau_drm(drm_dev);
+	struct nouveau_device *device = nvkm_device(&drm->device);
 	struct nouveau_platform_gpu *gpu = nv_device_to_platform(device)->gpu;
 
 	nouveau_drm_device_remove(drm_dev);
-- 
2.0.4



More information about the Nouveau mailing list