[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios Use ...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ab8f9967fbe3
branches:  trunk
changeset: 341229:ab8f9967fbe3
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Tue Oct 27 13:13:47 2015 +0000

description:
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.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r e6b598fb15e5 -r ab8f9967fbe3 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c        Tue Oct 27 08:46:13 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c        Tue Oct 27 13:13:47 2015 +0000
@@ -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 @@
                } 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);