[src/trunk]: src/sys/external/bsd/drm2 drm: Ifdef out devm_* stuff rather tha...

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

details:   https://anonhg.NetBSD.org/src/rev/b345c5abd769
branches:  trunk
changeset: 368536:b345c5abd769
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Jul 17 14:11:18 2022 +0000

description:
drm: Ifdef out devm_* stuff rather than stub it out.

Stub is not helpful, and this pollutes the symbol namespace.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_drv.c     |  8 ++++++--
 sys/external/bsd/drm2/include/linux/device.h |  9 +--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diffs (57 lines):

diff -r a878d5e5de86 -r b345c5abd769 sys/external/bsd/drm2/dist/drm/drm_drv.c
--- a/sys/external/bsd/drm2/dist/drm/drm_drv.c  Sun Jul 17 14:11:07 2022 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_drv.c  Sun Jul 17 14:11:18 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_drv.c,v 1.22 2021/12/19 12:32:01 riastradh Exp $   */
+/*     $NetBSD: drm_drv.c,v 1.23 2022/07/17 14:11:18 riastradh Exp $   */
 
 /*
  * Created: Fri Jan 19 10:48:35 2001 by faith%acm.org@localhost
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.22 2021/12/19 12:32:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.23 2022/07/17 14:11:18 riastradh Exp $");
 
 #include <linux/debugfs.h>
 #include <linux/fs.h>
@@ -767,6 +767,8 @@
 }
 EXPORT_SYMBOL(drm_dev_init);
 
+#ifndef __NetBSD__
+
 static void devm_drm_dev_init_release(void *data)
 {
        drm_dev_put(data);
@@ -806,6 +808,8 @@
 }
 EXPORT_SYMBOL(devm_drm_dev_init);
 
+#endif
+
 /**
  * drm_dev_fini - Finalize a dead DRM device
  * @dev: DRM device
diff -r a878d5e5de86 -r b345c5abd769 sys/external/bsd/drm2/include/linux/device.h
--- a/sys/external/bsd/drm2/include/linux/device.h      Sun Jul 17 14:11:07 2022 +0000
+++ b/sys/external/bsd/drm2/include/linux/device.h      Sun Jul 17 14:11:18 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: device.h,v 1.15 2021/12/19 12:29:09 riastradh Exp $    */
+/*     $NetBSD: device.h,v 1.16 2022/07/17 14:11:18 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -96,11 +96,4 @@
 {
 }
 
-static inline int
-devm_add_action(struct device *parent, void (*func)(void *),
-    void *data)
-{
-       panic("TODO");
-}
-
 #endif  /* _LINUX_DEVICE_H_ */