Module Name: src
Committed By: thorpej
Date: Sun Jan 17 21:42:35 UTC 2021
Modified Files:
src/sys/dev/i2c: ac100.c adadc.c adm1021.c adm1026.c anxedp.c as3722.c
asms.c axp20x.c axp22x.c cwfg.c dbcool.c dstemp.c em3027.c
es8316ac.c fcu.c hytp14.c lm75.c lm87.c max77620.c pca9685.c
pcf8563.c pcf8574.c spdmem_i2c.c ssdfb_i2c.c sy8106a.c tcagpio.c
tcakp.c tda19988.c titemp.c tps65217pmic.c twl4030.c
src/sys/dev/spi: m25p.c oj6sh.c ssdfb_spi.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.4 -r1.5 src/sys/dev/i2c/ac100.c src/sys/dev/i2c/tda19988.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/i2c/adadc.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/i2c/adm1021.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/i2c/adm1026.c src/sys/dev/i2c/max77620.c \
src/sys/dev/i2c/titemp.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/i2c/anxedp.c src/sys/dev/i2c/pca9685.c \
src/sys/dev/i2c/twl4030.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/i2c/as3722.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/asms.c src/sys/dev/i2c/cwfg.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/i2c/axp20x.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/i2c/axp22x.c src/sys/dev/i2c/dstemp.c \
src/sys/dev/i2c/pcf8574.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/i2c/dbcool.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/i2c/em3027.c src/sys/dev/i2c/ssdfb_i2c.c \
src/sys/dev/i2c/sy8106a.c src/sys/dev/i2c/tcagpio.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/es8316ac.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/i2c/fcu.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/i2c/hytp14.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/i2c/lm75.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/i2c/lm87.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/i2c/pcf8563.c src/sys/dev/i2c/tcakp.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/i2c/spdmem_i2c.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/i2c/tps65217pmic.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/spi/m25p.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/spi/oj6sh.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/spi/ssdfb_spi.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/dev/i2c/ac100.c
diff -u src/sys/dev/i2c/ac100.c:1.4 src/sys/dev/i2c/ac100.c:1.5
--- src/sys/dev/i2c/ac100.c:1.4 Sat Jul 27 16:02:27 2019
+++ src/sys/dev/i2c/ac100.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ac100.c,v 1.4 2019/07/27 16:02:27 thorpej Exp $ */
+/* $NetBSD: ac100.c,v 1.5 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_fdt.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ac100.c,v 1.4 2019/07/27 16:02:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ac100.c,v 1.5 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,8 +93,9 @@ __KERNEL_RCSID(0, "$NetBSD: ac100.c,v 1.
#define AC100_RTC_UPD_TRIG_WRITE __BIT(15)
static const struct device_compatible_entry compat_data[] = {
- { "x-powers,ac100", 0 },
- { NULL, 0 }
+ { .compat = "x-powers,ac100" },
+
+ { 0 }
};
struct ac100_softc {
Index: src/sys/dev/i2c/tda19988.c
diff -u src/sys/dev/i2c/tda19988.c:1.4 src/sys/dev/i2c/tda19988.c:1.5
--- src/sys/dev/i2c/tda19988.c:1.4 Mon Dec 23 15:05:32 2019
+++ src/sys/dev/i2c/tda19988.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tda19988.c,v 1.4 2019/12/23 15:05:32 thorpej Exp $ */
+/* $NetBSD: tda19988.c,v 1.5 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2015 Oleksandr Tymoshenko <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tda19988.c,v 1.4 2019/12/23 15:05:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tda19988.c,v 1.5 2021/01/17 21:42:35 thorpej Exp $");
/*
* NXP TDA19988 HDMI encoder
@@ -244,8 +244,9 @@ enum {
#define TDA19988 0x0301
static const struct device_compatible_entry compat_data[] = {
- { "nxp,tda998x", 1 },
- { NULL }
+ { .compat = "nxp,tda998x" },
+
+ { 0 }
};
struct tda19988_softc;
Index: src/sys/dev/i2c/adadc.c
diff -u src/sys/dev/i2c/adadc.c:1.7 src/sys/dev/i2c/adadc.c:1.8
--- src/sys/dev/i2c/adadc.c:1.7 Sat Jun 15 02:00:21 2019
+++ src/sys/dev/i2c/adadc.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: adadc.c,v 1.7 2019/06/15 02:00:21 macallan Exp $ */
+/* $NetBSD: adadc.c,v 1.8 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2018 Michael Lorenz
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adadc.c,v 1.7 2019/06/15 02:00:21 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adadc.c,v 1.8 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,8 +94,9 @@ CFATTACH_DECL_NEW(adadc, sizeof(struct a
adadc_match, adadc_attach, NULL, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "ad7417", 0 },
- { NULL, 0 }
+ { .compat = "ad7417" },
+
+ { 0 }
};
/* calibaration table from Darwin via Linux */
Index: src/sys/dev/i2c/adm1021.c
diff -u src/sys/dev/i2c/adm1021.c:1.21 src/sys/dev/i2c/adm1021.c:1.22
--- src/sys/dev/i2c/adm1021.c:1.21 Thu Dec 10 17:02:51 2020
+++ src/sys/dev/i2c/adm1021.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: adm1021.c,v 1.21 2020/12/10 17:02:51 jdc Exp $ */
+/* $NetBSD: adm1021.c,v 1.22 2021/01/17 21:42:35 thorpej Exp $ */
/* $OpenBSD: adm1021.c,v 1.27 2007/06/24 05:34:35 dlg Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.21 2020/12/10 17:02:51 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.22 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -145,10 +145,11 @@ CFATTACH_DECL_NEW(admtemp, sizeof(struct
/* XXX: add flags for compats to admtemp_setflags() */
static const struct device_compatible_entry compat_data[] = {
- { "i2c-max1617", 0 },
- { "max6642", 0 },
- { "max6690", 0 },
- { NULL, 0 }
+ { .compat = "i2c-max1617" },
+ { .compat = "max6642" },
+ { .compat = "max6690" },
+
+ { 0 }
};
int
Index: src/sys/dev/i2c/adm1026.c
diff -u src/sys/dev/i2c/adm1026.c:1.8 src/sys/dev/i2c/adm1026.c:1.9
--- src/sys/dev/i2c/adm1026.c:1.8 Fri Jun 26 10:06:57 2020
+++ src/sys/dev/i2c/adm1026.c Sun Jan 17 21:42:35 2021
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm1026.c,v 1.8 2020/06/26 10:06:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm1026.c,v 1.9 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -129,8 +129,9 @@ CFATTACH_DECL_NEW(adm1026hm, sizeof(stru
adm1026_match, adm1026_attach, adm1026_detach, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "i2c-adm1026", 0 },
- { NULL, 0 }
+ { .compat = "i2c-adm1026" },
+
+ { 0 }
};
static int
Index: src/sys/dev/i2c/max77620.c
diff -u src/sys/dev/i2c/max77620.c:1.8 src/sys/dev/i2c/max77620.c:1.9
--- src/sys/dev/i2c/max77620.c:1.8 Mon Dec 23 19:20:18 2019
+++ src/sys/dev/i2c/max77620.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: max77620.c,v 1.8 2019/12/23 19:20:18 thorpej Exp $ */
+/* $NetBSD: max77620.c,v 1.9 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: max77620.c,v 1.8 2019/12/23 19:20:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: max77620.c,v 1.9 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,8 +68,9 @@ struct max77620_pin {
};
static const struct device_compatible_entry compat_data[] = {
- { "maxim,max77620", 0 },
- { NULL, 0 }
+ { .compat = "maxim,max77620" },
+
+ { 0 }
};
static uint8_t
Index: src/sys/dev/i2c/titemp.c
diff -u src/sys/dev/i2c/titemp.c:1.8 src/sys/dev/i2c/titemp.c:1.9
--- src/sys/dev/i2c/titemp.c:1.8 Mon Dec 23 15:07:42 2019
+++ src/sys/dev/i2c/titemp.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: titemp.c,v 1.8 2019/12/23 15:07:42 thorpej Exp $ */
+/* $NetBSD: titemp.c,v 1.9 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: titemp.c,v 1.8 2019/12/23 15:07:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: titemp.c,v 1.9 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,8 +85,9 @@ CFATTACH_DECL_NEW(titemp, sizeof(struct
titemp_match, titemp_attach, NULL, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "ti,tmp451", 0 },
- { NULL, 0 }
+ { .compat = "ti,tmp451" },
+
+ { 0 }
};
static int
Index: src/sys/dev/i2c/anxedp.c
diff -u src/sys/dev/i2c/anxedp.c:1.3 src/sys/dev/i2c/anxedp.c:1.4
--- src/sys/dev/i2c/anxedp.c:1.3 Wed Jan 1 18:09:44 2020
+++ src/sys/dev/i2c/anxedp.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: anxedp.c,v 1.3 2020/01/01 18:09:44 thorpej Exp $ */
+/* $NetBSD: anxedp.c,v 1.4 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: anxedp.c,v 1.3 2020/01/01 18:09:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: anxedp.c,v 1.4 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -68,8 +68,9 @@ __KERNEL_RCSID(0, "$NetBSD: anxedp.c,v 1
#define ANX_RPLY_RECEIV __BIT(1)
static const struct device_compatible_entry compat_data[] = {
- { "analogix,anx6345", 1 },
- { NULL }
+ { .compat = "analogix,anx6345" },
+
+ { 0 }
};
struct anxedp_softc;
Index: src/sys/dev/i2c/pca9685.c
diff -u src/sys/dev/i2c/pca9685.c:1.3 src/sys/dev/i2c/pca9685.c:1.4
--- src/sys/dev/i2c/pca9685.c:1.3 Thu Jul 25 04:24:44 2019
+++ src/sys/dev/i2c/pca9685.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pca9685.c,v 1.3 2019/07/25 04:24:44 thorpej Exp $ */
+/* $NetBSD: pca9685.c,v 1.4 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2018, 2019 Jason R. Thorpe
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pca9685.c,v 1.3 2019/07/25 04:24:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pca9685.c,v 1.4 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,8 +88,9 @@ static int pcapwm_pwm_set_config(struct
const struct pwm_config *);
static const struct device_compatible_entry compat_data[] = {
- { "nxp,pca9685-pwm", 0 },
- { NULL }
+ { .compat = "nxp,pca9685-pwm" },
+
+ { 0 }
};
static int
Index: src/sys/dev/i2c/twl4030.c
diff -u src/sys/dev/i2c/twl4030.c:1.3 src/sys/dev/i2c/twl4030.c:1.4
--- src/sys/dev/i2c/twl4030.c:1.3 Sun Nov 3 09:34:09 2019
+++ src/sys/dev/i2c/twl4030.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: twl4030.c,v 1.3 2019/11/03 09:34:09 jmcneill Exp $ */
+/* $NetBSD: twl4030.c,v 1.4 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_fdt.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twl4030.c,v 1.3 2019/11/03 09:34:09 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twl4030.c,v 1.4 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,8 +99,9 @@ struct twl_pin {
};
static const struct device_compatible_entry compat_data[] = {
- { "ti,twl4030", 0 },
- { NULL, 0 }
+ { .compat = "ti,twl4030" },
+
+ { 0 }
};
#ifdef FDT
Index: src/sys/dev/i2c/as3722.c
diff -u src/sys/dev/i2c/as3722.c:1.19 src/sys/dev/i2c/as3722.c:1.20
--- src/sys/dev/i2c/as3722.c:1.19 Sat Jan 4 02:21:15 2020
+++ src/sys/dev/i2c/as3722.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: as3722.c,v 1.19 2020/01/04 02:21:15 thorpej Exp $ */
+/* $NetBSD: as3722.c,v 1.20 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_fdt.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1.19 2020/01/04 02:21:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1.20 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -223,8 +223,9 @@ CFATTACH_DECL_NEW(as3722reg, sizeof(stru
#endif
static const struct device_compatible_entry compat_data[] = {
- { "ams,as3722", 0 },
- { NULL, 0 }
+ { .compat = "ams,as3722" },
+
+ { 0 }
};
static int
Index: src/sys/dev/i2c/asms.c
diff -u src/sys/dev/i2c/asms.c:1.1 src/sys/dev/i2c/asms.c:1.2
--- src/sys/dev/i2c/asms.c:1.1 Fri Apr 24 12:38:31 2020
+++ src/sys/dev/i2c/asms.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: asms.c,v 1.1 2020/04/24 12:38:31 macallan Exp $ */
+/* $NetBSD: asms.c,v 1.2 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2020 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asms.c,v 1.1 2020/04/24 12:38:31 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asms.c,v 1.2 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,9 +58,10 @@ CFATTACH_DECL_NEW(asms, sizeof(struct as
asms_match, asms_attach, NULL, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "accelerometer", 0 },
- { "AAPL,accelerometer_1", 0 },
- { NULL, 0 }
+ { .compat = "accelerometer" },
+ { .compat = "AAPL,accelerometer_1" },
+
+ { 0 }
};
/* ASMS Registers, from OpenBSD */
Index: src/sys/dev/i2c/cwfg.c
diff -u src/sys/dev/i2c/cwfg.c:1.1 src/sys/dev/i2c/cwfg.c:1.2
--- src/sys/dev/i2c/cwfg.c:1.1 Fri Jan 3 18:00:05 2020
+++ src/sys/dev/i2c/cwfg.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cwfg.c,v 1.1 2020/01/03 18:00:05 jmcneill Exp $ */
+/* $NetBSD: cwfg.c,v 1.2 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cwfg.c,v 1.1 2020/01/03 18:00:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cwfg.c,v 1.2 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,8 +102,9 @@ struct cwfg_softc {
#define CWFG_ALERT_LEVEL_DEFAULT 0
static const struct device_compatible_entry compat_data[] = {
- { "cellwise,cw201x", 1 },
- { NULL, 0 }
+ { .compat = "cellwise,cw201x" },
+
+ { 0 }
};
static int
Index: src/sys/dev/i2c/axp20x.c
diff -u src/sys/dev/i2c/axp20x.c:1.16 src/sys/dev/i2c/axp20x.c:1.17
--- src/sys/dev/i2c/axp20x.c:1.16 Sun Feb 16 22:43:27 2020
+++ src/sys/dev/i2c/axp20x.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: axp20x.c,v 1.16 2020/02/16 22:43:27 thorpej Exp $ */
+/* $NetBSD: axp20x.c,v 1.17 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: axp20x.c,v 1.16 2020/02/16 22:43:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: axp20x.c,v 1.17 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -211,8 +211,9 @@ CFATTACH_DECL_NEW(axp20x, sizeof(struct
axp20x_match, axp20x_attach, NULL, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "x-powers,axp209", 0 },
- { NULL, 0 }
+ { .compat = "x-powers,axp209" },
+
+ { 0 }
};
static int
Index: src/sys/dev/i2c/axp22x.c
diff -u src/sys/dev/i2c/axp22x.c:1.6 src/sys/dev/i2c/axp22x.c:1.7
--- src/sys/dev/i2c/axp22x.c:1.6 Tue Jun 26 06:03:57 2018
+++ src/sys/dev/i2c/axp22x.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: axp22x.c,v 1.6 2018/06/26 06:03:57 thorpej Exp $ */
+/* $NetBSD: axp22x.c,v 1.7 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: axp22x.c,v 1.6 2018/06/26 06:03:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: axp22x.c,v 1.7 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,8 +41,9 @@ __KERNEL_RCSID(0, "$NetBSD: axp22x.c,v 1
#include <dev/sysmon/sysmonvar.h>
static const struct device_compatible_entry compat_data[] = {
- { "x-powers,axp221", 0 },
- { NULL, 0 }
+ { .compat = "x-powers,axp221" },
+
+ { 0 }
};
#define AXP_TEMP_MON_REG 0x56 /* 2 bytes */
Index: src/sys/dev/i2c/dstemp.c
diff -u src/sys/dev/i2c/dstemp.c:1.6 src/sys/dev/i2c/dstemp.c:1.7
--- src/sys/dev/i2c/dstemp.c:1.6 Fri Aug 21 21:28:22 2020
+++ src/sys/dev/i2c/dstemp.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dstemp.c,v 1.6 2020/08/21 21:28:22 macallan Exp $ */
+/* $NetBSD: dstemp.c,v 1.7 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2018 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dstemp.c,v 1.6 2020/08/21 21:28:22 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dstemp.c,v 1.7 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,8 +78,9 @@ CFATTACH_DECL_NEW(dstemp, sizeof(struct
dstemp_match, dstemp_attach, NULL, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "ds1631", 0 },
- { NULL, 0 }
+ { .compat = "ds1631" },
+
+ { 0 }
};
static int
Index: src/sys/dev/i2c/pcf8574.c
diff -u src/sys/dev/i2c/pcf8574.c:1.6 src/sys/dev/i2c/pcf8574.c:1.7
--- src/sys/dev/i2c/pcf8574.c:1.6 Wed Dec 23 07:06:26 2020
+++ src/sys/dev/i2c/pcf8574.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pcf8574.c,v 1.6 2020/12/23 07:06:26 jdc Exp $ */
+/* $NetBSD: pcf8574.c,v 1.7 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcf8574.c,v 1.6 2020/12/23 07:06:26 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcf8574.c,v 1.7 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,8 +108,9 @@ CFATTACH_DECL_NEW(pcf8574io, sizeof(stru
pcf8574_match, pcf8574_attach, pcf8574_detach, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "i2c-pcf8574", 0 },
- { NULL, 0 }
+ { .compat = "i2c-pcf8574" },
+
+ { 0 }
};
static int
Index: src/sys/dev/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.56 src/sys/dev/i2c/dbcool.c:1.57
--- src/sys/dev/i2c/dbcool.c:1.56 Sun Jul 12 06:42:32 2020
+++ src/sys/dev/i2c/dbcool.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool.c,v 1.56 2020/07/12 06:42:32 macallan Exp $ */
+/* $NetBSD: dbcool.c,v 1.57 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.56 2020/07/12 06:42:32 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.57 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -732,11 +732,12 @@ CFATTACH_DECL_NEW(dbcool, sizeof(struct
dbcool_match, dbcool_attach, dbcool_detach, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "i2c-adm1031", 0 },
- { "adt7467", 0 },
- { "adt7460", 0 },
- { "adm1030", 0 },
- { NULL, 0 }
+ { .compat = "i2c-adm1031" },
+ { .compat = "adt7467" },
+ { .compat = "adt7460" },
+ { .compat = "adm1030" },
+
+ { 0 }
};
int
Index: src/sys/dev/i2c/em3027.c
diff -u src/sys/dev/i2c/em3027.c:1.5 src/sys/dev/i2c/em3027.c:1.6
--- src/sys/dev/i2c/em3027.c:1.5 Wed Dec 23 17:57:00 2020
+++ src/sys/dev/i2c/em3027.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: em3027.c,v 1.5 2020/12/23 17:57:00 uwe Exp $ */
+/* $NetBSD: em3027.c,v 1.6 2021/01/17 21:42:35 thorpej Exp $ */
/*
* Copyright (c) 2018 Valery Ushakov
* All rights reserved.
@@ -28,7 +28,7 @@
* EM Microelectronic EM3027 RTC
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: em3027.c,v 1.5 2020/12/23 17:57:00 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: em3027.c,v 1.6 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -106,8 +106,9 @@ static int em3027rtc_read_byte(struct em
static int em3027rtc_write_byte(struct em3027rtc_softc *, uint8_t, uint8_t);
static const struct device_compatible_entry compat_data[] = {
- { "emmicro,em3027", 0 },
- { NULL, 0 },
+ { .compat = "emmicro,em3027" },
+
+ { 0 }
};
static int
Index: src/sys/dev/i2c/ssdfb_i2c.c
diff -u src/sys/dev/i2c/ssdfb_i2c.c:1.5 src/sys/dev/i2c/ssdfb_i2c.c:1.6
--- src/sys/dev/i2c/ssdfb_i2c.c:1.5 Tue Nov 5 19:59:35 2019
+++ src/sys/dev/i2c/ssdfb_i2c.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ssdfb_i2c.c,v 1.5 2019/11/05 19:59:35 tnn Exp $ */
+/* $NetBSD: ssdfb_i2c.c,v 1.6 2021/01/17 21:42:35 thorpej Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ssdfb_i2c.c,v 1.5 2019/11/05 19:59:35 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssdfb_i2c.c,v 1.6 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -67,9 +67,10 @@ CFATTACH_DECL_NEW(ssdfb_iic, sizeof(stru
ssdfb_i2c_match, ssdfb_i2c_attach, ssdfb_i2c_detach, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "solomon,ssd1306fb-i2c", 0 },
- { "sino,sh1106fb-i2c", 0 },
- { NULL, 0 }
+ { .compat = "solomon,ssd1306fb-i2c" },
+ { .compat = "sino,sh1106fb-i2c" },
+
+ { 0 }
};
static int
Index: src/sys/dev/i2c/sy8106a.c
diff -u src/sys/dev/i2c/sy8106a.c:1.5 src/sys/dev/i2c/sy8106a.c:1.6
--- src/sys/dev/i2c/sy8106a.c:1.5 Mon Dec 23 19:35:07 2019
+++ src/sys/dev/i2c/sy8106a.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sy8106a.c,v 1.5 2019/12/23 19:35:07 thorpej Exp $ */
+/* $NetBSD: sy8106a.c,v 1.6 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sy8106a.c,v 1.5 2019/12/23 19:35:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sy8106a.c,v 1.6 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,8 +60,9 @@ struct sy8106a_softc {
};
static const struct device_compatible_entry compat_data[] = {
- { "silergy,sy8106a", 0 },
- { NULL, 0 }
+ { .compat = "silergy,sy8106a" },
+
+ { 0 }
};
static uint8_t
Index: src/sys/dev/i2c/tcagpio.c
diff -u src/sys/dev/i2c/tcagpio.c:1.5 src/sys/dev/i2c/tcagpio.c:1.6
--- src/sys/dev/i2c/tcagpio.c:1.5 Mon Dec 23 19:38:58 2019
+++ src/sys/dev/i2c/tcagpio.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcagpio.c,v 1.5 2019/12/23 19:38:58 thorpej Exp $ */
+/* $NetBSD: tcagpio.c,v 1.6 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcagpio.c,v 1.5 2019/12/23 19:38:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcagpio.c,v 1.6 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -69,8 +69,9 @@ struct tcagpio_pin {
};
static const struct device_compatible_entry compat_data[] = {
- { "ti,tca9539", 0 },
- { NULL, 0 }
+ { .compat = "ti,tca9539" },
+
+ { 0 }
};
static uint8_t
Index: src/sys/dev/i2c/es8316ac.c
diff -u src/sys/dev/i2c/es8316ac.c:1.2 src/sys/dev/i2c/es8316ac.c:1.3
--- src/sys/dev/i2c/es8316ac.c:1.2 Fri Jan 3 01:00:08 2020
+++ src/sys/dev/i2c/es8316ac.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: es8316ac.c,v 1.2 2020/01/03 01:00:08 jmcneill Exp $ */
+/* $NetBSD: es8316ac.c,v 1.3 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: es8316ac.c,v 1.2 2020/01/03 01:00:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: es8316ac.c,v 1.3 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -103,8 +103,9 @@ __KERNEL_RCSID(0, "$NetBSD: es8316ac.c,v
#define DACVOL_R_DACVOLUME __BITS(7,0)
static const struct device_compatible_entry compat_data[] = {
- { "everest,es8316", 1 },
- { NULL }
+ { .compat = "everest,es8316" },
+
+ { 0 }
};
struct escodec_softc {
Index: src/sys/dev/i2c/fcu.c
diff -u src/sys/dev/i2c/fcu.c:1.9 src/sys/dev/i2c/fcu.c:1.10
--- src/sys/dev/i2c/fcu.c:1.9 Sat Jun 15 02:00:21 2019
+++ src/sys/dev/i2c/fcu.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fcu.c,v 1.9 2019/06/15 02:00:21 macallan Exp $ */
+/* $NetBSD: fcu.c,v 1.10 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2018 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fcu.c,v 1.9 2019/06/15 02:00:21 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fcu.c,v 1.10 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -116,8 +116,9 @@ CFATTACH_DECL_NEW(fcu, sizeof(struct fcu
fcu_match, fcu_attach, NULL, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "fcu", 0 },
- { NULL, 0 }
+ { .compat = "fcu" },
+
+ { 0 }
};
static int
Index: src/sys/dev/i2c/hytp14.c
diff -u src/sys/dev/i2c/hytp14.c:1.10 src/sys/dev/i2c/hytp14.c:1.11
--- src/sys/dev/i2c/hytp14.c:1.10 Sat Dec 5 14:50:33 2020
+++ src/sys/dev/i2c/hytp14.c Sun Jan 17 21:42:35 2021
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hytp14.c,v 1.10 2020/12/05 14:50:33 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hytp14.c,v 1.11 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,8 +120,9 @@ static struct hytp14_sensor hytp14_senso
};
static const struct device_compatible_entry compat_data[] = {
- { "i2c-hytp14", 0 },
- { NULL, 0 }
+ { .compat = "i2c-hytp14" },
+
+ { 0 }
};
static int
Index: src/sys/dev/i2c/lm75.c
diff -u src/sys/dev/i2c/lm75.c:1.36 src/sys/dev/i2c/lm75.c:1.37
--- src/sys/dev/i2c/lm75.c:1.36 Fri Aug 21 20:41:43 2020
+++ src/sys/dev/i2c/lm75.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lm75.c,v 1.36 2020/08/21 20:41:43 macallan Exp $ */
+/* $NetBSD: lm75.c,v 1.37 2021/01/17 21:42:35 thorpej Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm75.c,v 1.36 2020/08/21 20:41:43 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm75.c,v 1.37 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,14 +95,14 @@ static void lmtemp_setup_sysctl(struct l
static int sysctl_lm75_temp(SYSCTLFN_ARGS);
static const struct device_compatible_entry compat_data[] = {
- { "i2c-lm75", 0 },
- { "lm75", 0 },
- { "ds1775", 0 },
+ { .compat = "i2c-lm75" },
+ { .compat = "lm75" },
+ { .compat = "ds1775" },
/*
* see XXX in _attach() below: add code once non-lm75 matches are
* added here!
*/
- { NULL, 0 }
+ { 0 }
};
enum {
Index: src/sys/dev/i2c/lm87.c
diff -u src/sys/dev/i2c/lm87.c:1.11 src/sys/dev/i2c/lm87.c:1.12
--- src/sys/dev/i2c/lm87.c:1.11 Mon Dec 23 14:43:03 2019
+++ src/sys/dev/i2c/lm87.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lm87.c,v 1.11 2019/12/23 14:43:03 thorpej Exp $ */
+/* $NetBSD: lm87.c,v 1.12 2021/01/17 21:42:35 thorpej Exp $ */
/* $OpenBSD: lm87.c,v 1.20 2008/11/10 05:19:48 cnst Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm87.c,v 1.11 2019/12/23 14:43:03 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm87.c,v 1.12 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -136,12 +136,13 @@ CFATTACH_DECL_NEW(lmenv, sizeof(struct l
lmenv_match, lmenv_attach, NULL, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "lm87", 0 },
- { "lm87cimt", 0 },
- { "adm9240", 0 },
- { "lm81", 0 },
- { "ds1780", 0 },
- { NULL, 0 }
+ { .compat = "lm87" },
+ { .compat = "lm87cimt" },
+ { .compat = "adm9240" },
+ { .compat = "lm81" },
+ { .compat = "ds1780" },
+
+ { 0 }
};
int
Index: src/sys/dev/i2c/pcf8563.c
diff -u src/sys/dev/i2c/pcf8563.c:1.12 src/sys/dev/i2c/pcf8563.c:1.13
--- src/sys/dev/i2c/pcf8563.c:1.12 Thu Jan 2 16:48:05 2020
+++ src/sys/dev/i2c/pcf8563.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pcf8563.c,v 1.12 2020/01/02 16:48:05 thorpej Exp $ */
+/* $NetBSD: pcf8563.c,v 1.13 2021/01/17 21:42:35 thorpej Exp $ */
/*
* Copyright (c) 2011 Jonathan A. Kollasch
@@ -32,7 +32,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcf8563.c,v 1.12 2020/01/02 16:48:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcf8563.c,v 1.13 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,9 +49,10 @@ __KERNEL_RCSID(0, "$NetBSD: pcf8563.c,v
#endif
static const struct device_compatible_entry compat_data[] = {
- { "nxp,pcf8563", 0 },
- { "pcf8563rtc", 0 },
- { NULL, 0 }
+ { .compat = "nxp,pcf8563" },
+ { .compat = "pcf8563rtc" },
+
+ { 0 }
};
struct pcf8563rtc_softc {
Index: src/sys/dev/i2c/tcakp.c
diff -u src/sys/dev/i2c/tcakp.c:1.12 src/sys/dev/i2c/tcakp.c:1.13
--- src/sys/dev/i2c/tcakp.c:1.12 Wed Dec 16 19:49:04 2020
+++ src/sys/dev/i2c/tcakp.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcakp.c,v 1.12 2020/12/16 19:49:04 christos Exp $ */
+/* $NetBSD: tcakp.c,v 1.13 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_fdt.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcakp.c,v 1.12 2020/12/16 19:49:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcakp.c,v 1.13 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,8 +118,9 @@ CFATTACH_DECL_NEW(tcakp, sizeof(struct t
tcakp_match, tcakp_attach, NULL, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "ti,tca8418", 0 },
- { NULL, 0 }
+ { .compat = "ti,tca8418" },
+
+ { 0 }
};
static u_int
Index: src/sys/dev/i2c/spdmem_i2c.c
diff -u src/sys/dev/i2c/spdmem_i2c.c:1.18 src/sys/dev/i2c/spdmem_i2c.c:1.19
--- src/sys/dev/i2c/spdmem_i2c.c:1.18 Mon Dec 23 14:55:22 2019
+++ src/sys/dev/i2c/spdmem_i2c.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: spdmem_i2c.c,v 1.18 2019/12/23 14:55:22 thorpej Exp $ */
+/* $NetBSD: spdmem_i2c.c,v 1.19 2021/01/17 21:42:35 thorpej Exp $ */
/*
* Copyright (c) 2007 Nicolas Joly
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spdmem_i2c.c,v 1.18 2019/12/23 14:55:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spdmem_i2c.c,v 1.19 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -173,9 +173,10 @@ error:
}
static const struct device_compatible_entry compat_data[] = {
- { "atmel,spd", 0 },
- { "i2c-at34c02", 0 },
- { NULL, 0 }
+ { .compat = "atmel,spd" },
+ { .compat = "i2c-at34c02" },
+
+ { 0 }
};
static int
Index: src/sys/dev/i2c/tps65217pmic.c
diff -u src/sys/dev/i2c/tps65217pmic.c:1.15 src/sys/dev/i2c/tps65217pmic.c:1.16
--- src/sys/dev/i2c/tps65217pmic.c:1.15 Mon Dec 23 21:24:59 2019
+++ src/sys/dev/i2c/tps65217pmic.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tps65217pmic.c,v 1.15 2019/12/23 21:24:59 thorpej Exp $ */
+/* $NetBSD: tps65217pmic.c,v 1.16 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include "opt_fdt.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tps65217pmic.c,v 1.15 2019/12/23 21:24:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tps65217pmic.c,v 1.16 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -299,8 +299,9 @@ static struct tps_reg_param tps_regulato
static bool matched = false;
static const struct device_compatible_entry compat_data[] = {
- { "ti,tps65217", 0 },
- { NULL }
+ { .compat = "ti,tps65217" },
+
+ { 0 }
};
static int
Index: src/sys/dev/spi/m25p.c
diff -u src/sys/dev/spi/m25p.c:1.15 src/sys/dev/spi/m25p.c:1.16
--- src/sys/dev/spi/m25p.c:1.15 Tue Nov 26 02:41:58 2019
+++ src/sys/dev/spi/m25p.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: m25p.c,v 1.15 2019/11/26 02:41:58 hkenken Exp $ */
+/* $NetBSD: m25p.c,v 1.16 2021/01/17 21:42:35 thorpej Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: m25p.c,v 1.15 2019/11/26 02:41:58 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m25p.c,v 1.16 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -117,8 +117,9 @@ static const struct m25p_info {
};
static const struct device_compatible_entry compat_data[] = {
- { "jedec,spi-nor", 0 },
- { NULL, 0 }
+ { .compat = "jedec,spi-nor" },
+
+ { 0 }
};
static int
Index: src/sys/dev/spi/oj6sh.c
diff -u src/sys/dev/spi/oj6sh.c:1.5 src/sys/dev/spi/oj6sh.c:1.6
--- src/sys/dev/spi/oj6sh.c:1.5 Wed Aug 21 08:03:22 2019
+++ src/sys/dev/spi/oj6sh.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: oj6sh.c,v 1.5 2019/08/21 08:03:22 martin Exp $ */
+/* $NetBSD: oj6sh.c,v 1.6 2021/01/17 21:42:35 thorpej Exp $ */
/*
* Copyright (c) 2014 Genetec Corporation. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oj6sh.c,v 1.5 2019/08/21 08:03:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oj6sh.c,v 1.6 2021/01/17 21:42:35 thorpej Exp $");
#include "opt_oj6sh.h"
@@ -127,8 +127,9 @@ static const struct wsmouse_accessops oj
};
static const struct device_compatible_entry compat_data[] = {
- { "oj6sh", 0 },
- { NULL, 0 }
+ { .compat = "oj6sh" },
+
+ { 0 }
};
static int
Index: src/sys/dev/spi/ssdfb_spi.c
diff -u src/sys/dev/spi/ssdfb_spi.c:1.3 src/sys/dev/spi/ssdfb_spi.c:1.4
--- src/sys/dev/spi/ssdfb_spi.c:1.3 Sat Nov 2 22:55:57 2019
+++ src/sys/dev/spi/ssdfb_spi.c Sun Jan 17 21:42:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ssdfb_spi.c,v 1.3 2019/11/02 22:55:57 tnn Exp $ */
+/* $NetBSD: ssdfb_spi.c,v 1.4 2021/01/17 21:42:35 thorpej Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ssdfb_spi.c,v 1.3 2019/11/02 22:55:57 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssdfb_spi.c,v 1.4 2021/01/17 21:42:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -74,8 +74,9 @@ CFATTACH_DECL_NEW(ssdfb_spi, sizeof(stru
ssdfb_spi_match, ssdfb_spi_attach, NULL, NULL);
static const struct device_compatible_entry compat_data[] = {
- { "solomon,ssd1322", 0 },
- { NULL, 0 }
+ { .compat = "solomon,ssd1322" },
+
+ { 0 }
};
static int
