Module Name: src
Committed By: skrll
Date: Fri Dec 25 12:33:03 UTC 2020
Modified Files:
src/sys/dev/ic: mvsata.c siisata.c
Log Message:
Use designated initializers for struct ata_bustype
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/ic/mvsata.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/ic/siisata.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/ic/mvsata.c
diff -u src/sys/dev/ic/mvsata.c:1.57 src/sys/dev/ic/mvsata.c:1.58
--- src/sys/dev/ic/mvsata.c:1.57 Tue May 19 08:08:51 2020
+++ src/sys/dev/ic/mvsata.c Fri Dec 25 12:33:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsata.c,v 1.57 2020/05/19 08:08:51 jdolecek Exp $ */
+/* $NetBSD: mvsata.c,v 1.58 2020/12/25 12:33:03 skrll Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.57 2020/05/19 08:08:51 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.58 2020/12/25 12:33:03 skrll Exp $");
#include "opt_mvsata.h"
@@ -221,16 +221,16 @@ static void mvsata_print_eprd(struct mvs
#endif
static const struct ata_bustype mvsata_ata_bustype = {
- SCSIPI_BUSTYPE_ATA,
- mvsata_bio,
- mvsata_reset_drive,
- mvsata_reset_channel,
- mvsata_exec_command,
- ata_get_params,
- mvsata_addref,
- mvsata_delref,
- mvsata_killpending,
- mvsata_channel_recover,
+ .bustype_type = SCSIPI_BUSTYPE_ATA,
+ .ata_bio = mvsata_bio,
+ .ata_reset_drive = mvsata_reset_drive,
+ .ata_reset_channel = mvsata_reset_channel,
+ .ata_exec_command = mvsata_exec_command,
+ .ata_get_params = ata_get_params,
+ .ata_addref = mvsata_addref,
+ .ata_delref = mvsata_delref,
+ .ata_killpending = mvsata_killpending,
+ .ata_recovery = mvsata_channel_recover,
};
#if NATAPIBUS > 0
Index: src/sys/dev/ic/siisata.c
diff -u src/sys/dev/ic/siisata.c:1.43 src/sys/dev/ic/siisata.c:1.44
--- src/sys/dev/ic/siisata.c:1.43 Sat Oct 10 20:27:54 2020
+++ src/sys/dev/ic/siisata.c Fri Dec 25 12:33:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata.c,v 1.43 2020/10/10 20:27:54 thorpej Exp $ */
+/* $NetBSD: siisata.c,v 1.44 2020/12/25 12:33:03 skrll Exp $ */
/* from ahcisata_core.c */
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.43 2020/10/10 20:27:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.44 2020/12/25 12:33:03 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -184,16 +184,16 @@ void siisata_atapi_kill_pending(struct s
#endif /* NATAPIBUS */
const struct ata_bustype siisata_ata_bustype = {
- SCSIPI_BUSTYPE_ATA,
- siisata_ata_bio,
- siisata_reset_drive,
- siisata_reset_channel,
- siisata_exec_command,
- ata_get_params,
- siisata_ata_addref,
- siisata_ata_delref,
- siisata_killpending,
- siisata_channel_recover,
+ .bustype_type = SCSIPI_BUSTYPE_ATA,
+ .ata_bio = siisata_ata_bio,
+ .ata_reset_drive = siisata_reset_drive,
+ .ata_reset_channel = siisata_reset_channel,
+ .ata_exec_command = siisata_exec_command,
+ .ata_get_params = ata_get_params,
+ .ata_addref = siisata_ata_addref,
+ .ata_delref = siisata_ata_delref,
+ .ata_killpending = siisata_killpending,
+ .ata_recovery = siisata_channel_recover,
};
#if NATAPIBUS > 0
