[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device Us...

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

details:   https://anonhg.NetBSD.org/src/rev/b0dcd60a996b
branches:  trunk
changeset: 366063:b0dcd60a996b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:43:28 2018 +0000

description:
Use the struct device pointer that works, not the nonexistent one.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 0ea5b65f0737 -r b0dcd60a996b sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c        Mon Aug 27 07:43:16 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c        Mon Aug 27 07:43:28 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.6 2018/08/27 07:42:46 riastradh Exp $     */
+/*     $NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.7 2018/08/27 07:43:28 riastradh Exp $     */
 
 /*
  * Copyright 2015 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs <bskeggs%redhat.com@localhost>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.6 2018/08/27 07:42:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.7 2018/08/27 07:43:28 riastradh Exp $");
 
 #include <core/pci.h>
 #include "priv.h"
@@ -1709,7 +1709,8 @@
        *pdevice = &pdev->device;
        pdev->pdev = pci_dev;
 
-       return nvkm_device_ctor(&nvkm_device_pci_func, quirk, &pci_dev->dev,
+       return nvkm_device_ctor(&nvkm_device_pci_func, quirk,
+                               pci_dev_dev(pci_dev),
                                pci_is_pcie(pci_dev) ? NVKM_DEVICE_PCIE :
                                pci_find_capability(pci_dev, PCI_CAP_ID_AGP) ?
                                NVKM_DEVICE_AGP : NVKM_DEVICE_PCI,