[src/trunk]: src/sys/arch/hppa/dev Use designated initializers for hppa_pci_c...

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

details:   https://anonhg.NetBSD.org/src/rev/4187cd59fa0a
branches:  trunk
changeset: 369410:4187cd59fa0a
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Aug 16 08:40:33 2022 +0000

description:
Use designated initializers for hppa_pci_chipset_tag structs.

diffstat:

 sys/arch/hppa/dev/dino.c  |  23 +++++++++++++----------
 sys/arch/hppa/dev/elroy.c |  21 ++++++++++++---------
 2 files changed, 25 insertions(+), 19 deletions(-)

diffs (81 lines):

diff -r 51a7926a3d99 -r 4187cd59fa0a sys/arch/hppa/dev/dino.c
--- a/sys/arch/hppa/dev/dino.c  Tue Aug 16 08:35:38 2022 +0000
+++ b/sys/arch/hppa/dev/dino.c  Tue Aug 16 08:40:33 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dino.c,v 1.14 2022/08/16 08:35:38 skrll Exp $ */
+/*     $NetBSD: dino.c,v 1.15 2022/08/16 08:40:33 skrll Exp $ */
 
 /*     $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.14 2022/08/16 08:35:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.15 2022/08/16 08:40:33 skrll Exp $");
 
 /* #include "cardbus.h" */
 
@@ -1597,15 +1597,18 @@
 };
 
 const struct hppa_pci_chipset_tag dino_pc = {
-       NULL,
-       dino_attach_hook, dino_maxdevs, dino_make_tag, dino_decompose_tag,
-       dino_conf_read, dino_conf_write,
-       dino_intr_map, dino_intr_string,
-       dino_intr_establish, dino_intr_disestablish,
+       .pc_attach_hook = dino_attach_hook,
+       .pc_bus_maxdevs = dino_maxdevs,
+       .pc_make_tag = dino_make_tag,
+       .pc_decompose_tag = dino_decompose_tag,
+       .pc_conf_read = dino_conf_read,
+       .pc_conf_write = dino_conf_write,
+       .pc_intr_map = dino_intr_map,
+       .pc_intr_string = dino_intr_string,
+       .pc_intr_establish = dino_intr_establish,
+       .pc_intr_disestablish = dino_intr_disestablish,
 #if NCARDBUS > 0
-       dino_alloc_parent
-#else
-       NULL
+       .pc_alloc_parent = dino_alloc_parent,
 #endif
 };
 
diff -r 51a7926a3d99 -r 4187cd59fa0a sys/arch/hppa/dev/elroy.c
--- a/sys/arch/hppa/dev/elroy.c Tue Aug 16 08:35:38 2022 +0000
+++ b/sys/arch/hppa/dev/elroy.c Tue Aug 16 08:40:33 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elroy.c,v 1.4 2021/08/07 16:18:55 thorpej Exp $        */
+/*     $NetBSD: elroy.c,v 1.5 2022/08/16 08:40:33 skrll Exp $  */
 
 /*     $OpenBSD: elroy.c,v 1.5 2009/03/30 21:24:57 kettenis Exp $      */
 
@@ -1190,15 +1190,18 @@
 };
 
 const struct hppa_pci_chipset_tag elroy_pc = {
-       NULL,
-       elroy_attach_hook, elroy_maxdevs, elroy_make_tag, elroy_decompose_tag,
-       elroy_conf_read, elroy_conf_write,
-       apic_intr_map, apic_intr_string,
-       apic_intr_establish, apic_intr_disestablish,
+       .pc_attach_hook = elroy_attach_hook,
+       .pc_bus_maxdevs = elroy_maxdevs,
+       .pc_make_tag = elroy_make_tag,
+       .pc_decompose_tag = elroy_decompose_tag,
+       .pc_conf_read = elroy_conf_read,
+       .pc_conf_write = elroy_conf_write,
+       .pc_intr_map = apic_intr_map,
+       .pc_intr_string = apic_intr_string,
+       .pc_intr_establish = apic_intr_establish,
+       .pc_intr_disestablish = apic_intr_disestablish,
 #if NCARDBUS > 0
-       elroy_alloc_parent
-#else
-       NULL
+       .pc_alloc_parent = elroy_alloc_parent
 #endif
 };