[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau Conditional here shou...

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

details:   https://anonhg.NetBSD.org/src/rev/bec9c9cab2ab
branches:  trunk
changeset: 366161:bec9c9cab2ab
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 13:38:15 2018 +0000

description:
Conditional here shouldn't be necessary now.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c |  9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diffs (32 lines):

diff -r efacec70cd7c -r bec9c9cab2ab sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c      Mon Aug 27 13:37:55 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c      Mon Aug 27 13:38:15 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_drm.c,v 1.11 2018/08/27 07:38:10 riastradh Exp $       */
+/*     $NetBSD: nouveau_drm.c,v 1.12 2018/08/27 13:38:15 riastradh Exp $       */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_drm.c,v 1.11 2018/08/27 07:38:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_drm.c,v 1.12 2018/08/27 13:38:15 riastradh Exp $");
 
 #include <linux/console.h>
 #include <linux/delay.h>
@@ -98,13 +98,8 @@
 static u64
 nouveau_pci_name(struct pci_dev *pdev)
 {
-#ifdef __NetBSD__
-       u64 name = (u64)device_unit(device_parent(pdev->pd_dev)) << 32;
-       name |= (u64)pdev->pd_pa.pa_bus << 16;
-#else
        u64 name = (u64)pci_domain_nr(pdev->bus) << 32;
        name |= pdev->bus->number << 16;
-#endif
        name |= PCI_SLOT(pdev->devfn) << 8;
        return name | PCI_FUNC(pdev->devfn);
 }