[src/trunk]: src/sys/external/bsd/drm2/i915drm i915: Omit needless reachover ...

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

details:   https://anonhg.NetBSD.org/src/rev/ea9e3b260d81
branches:  trunk
changeset: 1028739:ea9e3b260d81
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:54:10 2021 +0000

description:
i915: Omit needless reachover of i915_drm_driver.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    |  8 ++------
 sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c |  7 +++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diffs (57 lines):

diff -r a12b8b893ac1 -r ea9e3b260d81 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:54:03 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:54:10 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.c,v 1.41 2021/12/19 11:54:03 riastradh Exp $  */
+/*     $NetBSD: i915_drv.c,v 1.42 2021/12/19 11:54:10 riastradh Exp $  */
 
 /* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
  */
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.41 2021/12/19 11:54:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.42 2021/12/19 11:54:10 riastradh Exp $");
 
 #include <linux/acpi.h>
 #include <linux/device.h>
@@ -102,10 +102,6 @@
 
 static struct drm_driver driver;
 
-#ifdef __NetBSD__
-/* XXX Kludge to expose this to NetBSD driver attachment goop.  */
-struct drm_driver *const i915_drm_driver = &driver;
-#endif
 struct vlv_s0ix_state {
        /* GAM */
        u32 wr_watermark;
diff -r a12b8b893ac1 -r ea9e3b260d81 sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c
--- a/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Sun Dec 19 11:54:03 2021 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Sun Dec 19 11:54:10 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_pci_autoconf.c,v 1.8 2021/12/19 11:54:03 riastradh Exp $  */
+/*     $NetBSD: i915_pci_autoconf.c,v 1.9 2021/12/19 11:54:10 riastradh Exp $  */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.8 2021/12/19 11:54:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.9 2021/12/19 11:54:10 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
@@ -80,8 +80,7 @@
 CFATTACH_DECL_NEW(i915drmkms, sizeof(struct i915drmkms_softc),
     i915drmkms_match, i915drmkms_attach, i915drmkms_detach, NULL);
 
-/* XXX Kludge to get these from i915_drv.c.  */
-extern struct drm_driver *const i915_drm_driver;
+/* XXX Kludge to get these from i915_pci.c.  */
 extern const struct pci_device_id *const i915_device_ids;
 extern const size_t i915_n_device_ids;