Module Name: src
Committed By: skrll
Date: Tue Aug 16 08:40:34 UTC 2022
Modified Files:
src/sys/arch/hppa/dev: dino.c elroy.c
Log Message:
Use designated initializers for hppa_pci_chipset_tag structs.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hppa/dev/dino.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/dev/elroy.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/hppa/dev/dino.c
diff -u src/sys/arch/hppa/dev/dino.c:1.14 src/sys/arch/hppa/dev/dino.c:1.15
--- src/sys/arch/hppa/dev/dino.c:1.14 Tue Aug 16 08:35:38 2022
+++ src/sys/arch/hppa/dev/dino.c Tue Aug 16 08:40:33 2022
@@ -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_bus_dma_tag dino_dmat
};
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
};
Index: src/sys/arch/hppa/dev/elroy.c
diff -u src/sys/arch/hppa/dev/elroy.c:1.4 src/sys/arch/hppa/dev/elroy.c:1.5
--- src/sys/arch/hppa/dev/elroy.c:1.4 Sat Aug 7 16:18:55 2021
+++ src/sys/arch/hppa/dev/elroy.c Tue Aug 16 08:40:33 2022
@@ -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_bus_dma_tag elroy_dmat
};
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
};
