Module Name: src
Committed By: riastradh
Date: Tue Oct 27 13:13:47 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios:
nouveau_subdev_bios_base.c
Log Message:
Use nv_device_base(dev) like other callers, not dev->pdev->dev.
First step in fixing the struct device nonsense. This won't actually
fix anything yet until we also fix nv_device_base.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c:1.2 Wed Feb 25 14:57:05 2015
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c Tue Oct 27 13:13:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_subdev_bios_base.c,v 1.2 2015/02/25 14:57:05 riastradh Exp $ */
+/* $NetBSD: nouveau_subdev_bios_base.c,v 1.3 2015/10/27 13:13:47 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_bios_base.c,v 1.2 2015/02/25 14:57:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_bios_base.c,v 1.3 2015/10/27 13:13:47 riastradh Exp $");
#include <core/object.h>
#include <core/device.h>
@@ -376,7 +376,8 @@ nouveau_bios_shadow(struct nouveau_bios
} while ((++mthd)->shadow);
/* attempt to load firmware image */
- ret = request_firmware(&fw, source, &nv_device(bios)->pdev->dev);
+ ret = request_firmware(&fw, source,
+ nv_device_base(nv_device(bios)));
if (ret == 0) {
bios->size = fw->size;
bios->data = kmemdup(fw->data, fw->size, GFP_KERNEL);
