[src/trunk]: src/sys/modules/drmkms_sched drmkms_sched: Remove duplicate modu...

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

details:   https://anonhg.NetBSD.org/src/rev/0f9649b7a355
branches:  trunk
changeset: 368694:0f9649b7a355
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Jul 28 10:42:45 2022 +0000

description:
drmkms_sched: Remove duplicate module definition.

diffstat:

 sys/external/bsd/drm2/dist/drm/scheduler/sched_fence.c |   7 +-
 sys/external/bsd/drm2/drm/files.drmkms                 |   3 +-
 sys/external/bsd/drm2/drm/sched_module.c               |  48 ------------------
 sys/modules/drmkms_sched/Makefile                      |   3 +-
 4 files changed, 6 insertions(+), 55 deletions(-)

diffs (114 lines):

diff -r 9cb98c107847 -r 0f9649b7a355 sys/external/bsd/drm2/dist/drm/scheduler/sched_fence.c
--- a/sys/external/bsd/drm2/dist/drm/scheduler/sched_fence.c    Thu Jul 28 10:41:07 2022 +0000
+++ b/sys/external/bsd/drm2/dist/drm/scheduler/sched_fence.c    Thu Jul 28 10:42:45 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sched_fence.c,v 1.5 2021/12/19 12:32:45 riastradh Exp $        */
+/*     $NetBSD: sched_fence.c,v 1.6 2022/07/28 10:42:45 riastradh Exp $        */
 
 /*
  * Copyright 2015 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sched_fence.c,v 1.5 2021/12/19 12:32:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sched_fence.c,v 1.6 2022/07/28 10:42:45 riastradh Exp $");
 
 #include <linux/kthread.h>
 #include <linux/module.h>
@@ -194,7 +194,8 @@
 MODULE_LICENSE("GPL and additional rights");
 
 #ifdef __NetBSD__
-MODULE(MODULE_CLASS_MISC, drmsched, NULL);
+MODULE(MODULE_CLASS_MISC, drmkms_sched, "drmkms,drmkms_linux");
+
 static int
 drmsched_modcmd(modcmd_t cmd, void *arg)
 {
diff -r 9cb98c107847 -r 0f9649b7a355 sys/external/bsd/drm2/drm/files.drmkms
--- a/sys/external/bsd/drm2/drm/files.drmkms    Thu Jul 28 10:41:07 2022 +0000
+++ b/sys/external/bsd/drm2/drm/files.drmkms    Thu Jul 28 10:42:45 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.drmkms,v 1.81 2022/07/24 19:23:59 riastradh Exp $
+#      $NetBSD: files.drmkms,v 1.82 2022/07/28 10:43:35 riastradh Exp $
 
 version        20180827
 
@@ -104,7 +104,6 @@
 file   external/bsd/drm2/dist/drm/scheduler/sched_entity.c     drmkms_sched
 file   external/bsd/drm2/dist/drm/scheduler/sched_fence.c      drmkms_sched
 file   external/bsd/drm2/dist/drm/scheduler/sched_main.c       drmkms_sched
-file   external/bsd/drm2/drm/sched_module.c                    drmkms_sched
 
 # Generated from drm2netbsd.
 #file  external/bsd/drm2/dist/drm/drm_agpsupport.c     drmkms  # drmkms_pci
diff -r 9cb98c107847 -r 0f9649b7a355 sys/external/bsd/drm2/drm/sched_module.c
--- a/sys/external/bsd/drm2/drm/sched_module.c  Thu Jul 28 10:41:07 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*     $NetBSD: sched_module.c,v 1.1 2022/07/23 12:52:10 riastradh Exp $       */
-
-/*-
- * Copyright (c) 2022 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sched_module.c,v 1.1 2022/07/23 12:52:10 riastradh Exp $");
-
-#include <sys/module.h>
-
-MODULE(MODULE_CLASS_MISC, drmkms_sched, "drmkms");
-
-static int
-drmkms_sched_modcmd(modcmd_t cmd, void *arg)
-{
-
-       switch (cmd) {
-       case MODULE_CMD_INIT:
-               return 0;
-       case MODULE_CMD_FINI:
-               return 0;
-       default:
-               return ENOTTY;
-       }
-}
diff -r 9cb98c107847 -r 0f9649b7a355 sys/modules/drmkms_sched/Makefile
--- a/sys/modules/drmkms_sched/Makefile Thu Jul 28 10:41:07 2022 +0000
+++ b/sys/modules/drmkms_sched/Makefile Thu Jul 28 10:42:45 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2022/07/28 10:41:07 riastradh Exp $
+#      $NetBSD: Makefile,v 1.4 2022/07/28 10:42:46 riastradh Exp $
 
 .include "../Makefile.inc"
 .include "../drmkms/Makefile.inc"
@@ -11,7 +11,6 @@
 SRCS+= sched_entity.c
 SRCS+= sched_fence.c
 SRCS+= sched_main.c
-SRCS+= sched_module.c
 
 WARNS= 3