Module Name: src
Committed By: thorpej
Date: Sun Jan 17 21:02:33 UTC 2021
Modified Files:
src/sys/arch/macppc/dev: deq.c lmu.c psoc.c smusat.c
Log Message:
Use designated initializers and a consistent termination style in
compat_data[].
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/macppc/dev/deq.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/macppc/dev/lmu.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/dev/psoc.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/macppc/dev/smusat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/dev/deq.c
diff -u src/sys/arch/macppc/dev/deq.c:1.17 src/sys/arch/macppc/dev/deq.c:1.18
--- src/sys/arch/macppc/dev/deq.c:1.17 Fri Sep 20 17:25:11 2019
+++ src/sys/arch/macppc/dev/deq.c Sun Jan 17 21:02:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: deq.c,v 1.17 2019/09/20 17:25:11 macallan Exp $ */
+/* $NetBSD: deq.c,v 1.18 2021/01/17 21:02:33 thorpej Exp $ */
/*-
* Copyright (C) 2005 Michael Lorenz
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: deq.c,v 1.17 2019/09/20 17:25:11 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: deq.c,v 1.18 2021/01/17 21:02:33 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,12 +53,13 @@ CFATTACH_DECL_NEW(deq, sizeof(struct deq
deq_match, deq_attach, NULL, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "deq", 0 },
- { "tas3004", 0 },
- { "pcm3052", 0 },
- { "cs8416", 0 },
- { "codec", 0 },
- { NULL, 0 }
+ { .compat = "deq" },
+ { .compat = "tas3004" },
+ { .compat = "pcm3052" },
+ { .compat = "cs8416" },
+ { .compat = "codec" },
+
+ { 0 }
};
int
Index: src/sys/arch/macppc/dev/lmu.c
diff -u src/sys/arch/macppc/dev/lmu.c:1.5 src/sys/arch/macppc/dev/lmu.c:1.6
--- src/sys/arch/macppc/dev/lmu.c:1.5 Sat Sep 12 18:12:53 2020
+++ src/sys/arch/macppc/dev/lmu.c Sun Jan 17 21:02:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lmu.c,v 1.5 2020/09/12 18:12:53 macallan Exp $ */
+/* $NetBSD: lmu.c,v 1.6 2021/01/17 21:02:33 thorpej Exp $ */
/*-
* Copyright (c) 2020 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lmu.c,v 1.5 2020/09/12 18:12:53 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lmu.c,v 1.6 2021/01/17 21:02:33 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -81,9 +81,10 @@ CFATTACH_DECL_NEW(lmu, sizeof(struct lmu
lmu_match, lmu_attach, NULL, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "lmu-micro", 0 },
- { "lmu-controller", 0 },
- { NULL, 0 }
+ { .compat = "lmu-micro" },
+ { .compat = "lmu-controller" },
+
+ { 0 }
};
/* time between polling the light sensors */
Index: src/sys/arch/macppc/dev/psoc.c
diff -u src/sys/arch/macppc/dev/psoc.c:1.3 src/sys/arch/macppc/dev/psoc.c:1.4
--- src/sys/arch/macppc/dev/psoc.c:1.3 Sat Nov 23 05:13:11 2019
+++ src/sys/arch/macppc/dev/psoc.c Sun Jan 17 21:02:33 2021
@@ -1,4 +1,4 @@
- /* $NetBSD: psoc.c,v 1.3 2019/11/23 05:13:11 macallan Exp $ */
+ /* $NetBSD: psoc.c,v 1.4 2021/01/17 21:02:33 thorpej Exp $ */
/*-
* Copyright (c) 2019 Michael Lorenz
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psoc.c,v 1.3 2019/11/23 05:13:11 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psoc.c,v 1.4 2021/01/17 21:02:33 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -81,8 +81,9 @@ CFATTACH_DECL_NEW(psoc, sizeof(struct ps
psoc_match, psoc_attach, NULL, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "Psoc", 0 },
- { NULL, 0 }
+ { .compat = "Psoc" },
+
+ { 0 }
};
static int
Index: src/sys/arch/macppc/dev/smusat.c
diff -u src/sys/arch/macppc/dev/smusat.c:1.6 src/sys/arch/macppc/dev/smusat.c:1.7
--- src/sys/arch/macppc/dev/smusat.c:1.6 Tue Jun 26 06:03:57 2018
+++ src/sys/arch/macppc/dev/smusat.c Sun Jan 17 21:02:33 2021
@@ -106,9 +106,10 @@ CFATTACH_DECL_NEW(smusat, sizeof(struct
smusat_match, smusat_attach, NULL, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "sat", 0 },
- { "smu-sat", 0 },
- { NULL, 0 }
+ { .compat = "sat" },
+ { .compat = "smu-sat" },
+
+ { 0 }
};
static int
