[src/trunk]: src/sys/external/bsd/drm2 Rename nouveau_devices_init/fini -> nv...

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

details:   https://anonhg.NetBSD.org/src/rev/d3bb90fc71ed
branches:  trunk
changeset: 366186:d3bb90fc71ed
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 13:43:52 2018 +0000

description:
Rename nouveau_devices_init/fini -> nvkm_devices_init/fini.

Matches newer upstream naming conventions better.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h                           |  6 +++---
 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c |  8 ++++----
 sys/external/bsd/drm2/nouveau/nouveau_module.c                                              |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diffs (91 lines):

diff -r 29e63adfc4b4 -r d3bb90fc71ed sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h
--- a/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h Mon Aug 27 13:43:39 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h Mon Aug 27 13:43:52 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: device.h,v 1.4 2018/08/27 07:32:31 riastradh Exp $     */
+/*     $NetBSD: device.h,v 1.5 2018/08/27 13:43:52 riastradh Exp $     */
 
 #ifndef __NVKM_DEVICE_H__
 #define __NVKM_DEVICE_H__
@@ -223,8 +223,8 @@
 int nvkm_device_list(u64 *name, int size);
 
 #ifdef __NetBSD__
-void   nouveau_devices_init(void);
-void   nouveau_devices_fini(void);
+void   nvkm_devices_init(void);
+void   nvkm_devices_fini(void);
 #endif
 
 /* privileged register interface accessor macros */
diff -r 29e63adfc4b4 -r d3bb90fc71ed sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c       Mon Aug 27 13:43:39 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c       Mon Aug 27 13:43:52 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_nvkm_engine_device_base.c,v 1.5 2018/08/27 07:39:33 riastradh Exp $    */
+/*     $NetBSD: nouveau_nvkm_engine_device_base.c,v 1.6 2018/08/27 13:43:52 riastradh Exp $    */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_base.c,v 1.5 2018/08/27 07:39:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_base.c,v 1.6 2018/08/27 13:43:52 riastradh Exp $");
 
 #include "priv.h"
 #include "acpi.h"
@@ -39,14 +39,14 @@
 static struct list_head nv_devices = LIST_HEAD_INIT(nv_devices);
 
 void
-nouveau_devices_init(void)
+nvkm_devices_init(void)
 {
 
        linux_mutex_init(&nv_devices_mutex);
 }
 
 void
-nouveau_devices_fini(void)
+nvkm_devices_fini(void)
 {
 
        linux_mutex_destroy(&nv_devices_mutex);
diff -r 29e63adfc4b4 -r d3bb90fc71ed sys/external/bsd/drm2/nouveau/nouveau_module.c
--- a/sys/external/bsd/drm2/nouveau/nouveau_module.c    Mon Aug 27 13:43:39 2018 +0000
+++ b/sys/external/bsd/drm2/nouveau/nouveau_module.c    Mon Aug 27 13:43:52 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_module.c,v 1.5 2018/08/27 06:41:25 riastradh Exp $     */
+/*     $NetBSD: nouveau_module.c,v 1.6 2018/08/27 13:43:52 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_module.c,v 1.5 2018/08/27 06:41:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_module.c,v 1.6 2018/08/27 13:43:52 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/module.h>
@@ -54,7 +54,7 @@
 static int
 nouveau_init(void)
 {
-       nouveau_devices_init();
+       nvkm_devices_init();
        drm_sysctl_init(&nouveau_def);
 
        return 0;
@@ -65,7 +65,7 @@
 {
 
        drm_sysctl_fini(&nouveau_def);
-       nouveau_devices_fini();
+       nvkm_devices_fini();
 }
 
 static int