diff options
| author | skrll <skrll@NetBSD.org> | 2020-12-25 08:55:40 +0000 |
|---|---|---|
| committer | skrll <skrll@NetBSD.org> | 2020-12-25 08:55:40 +0000 |
| commit | e37f021b012bb9b934638dd7bfd53c59f654bb20 (patch) | |
| tree | 7fef63696f1aa1bca3013bfc9afb2f2bf4569108 /sys/dev | |
| parent | 8b4c435258fb2bf76ae0f6bafc8051aa73d4968d (diff) | |
Use designated initializers for struct ata_bustype
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ata/ata_wdc.c | 24 | ||||
| -rw-r--r-- | sys/dev/ic/ahcisata_core.c | 24 |
2 files changed, 24 insertions, 24 deletions
diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c index 5fc018637a4..6d0445e1a01 100644 --- a/sys/dev/ata/ata_wdc.c +++ b/sys/dev/ata/ata_wdc.c @@ -1,4 +1,4 @@ -/* $NetBSD: ata_wdc.c,v 1.118 2020/05/21 09:11:33 jdolecek Exp $ */ +/* $NetBSD: ata_wdc.c,v 1.119 2020/12/25 08:55:40 skrll Exp $ */ /* * Copyright (c) 1998, 2001, 2003 Manuel Bouyer. @@ -54,7 +54,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.118 2020/05/21 09:11:33 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.119 2020/12/25 08:55:40 skrll Exp $"); #include "opt_ata.h" #include "opt_wdc.h" @@ -119,16 +119,16 @@ static int wdc_ata_addref(struct ata_drive_datas *); static void wdc_ata_delref(struct ata_drive_datas *); const struct ata_bustype wdc_ata_bustype = { - SCSIPI_BUSTYPE_ATA, - wdc_ata_bio, - wdc_reset_drive, - wdc_reset_channel, - wdc_exec_command, - ata_get_params, - wdc_ata_addref, - wdc_ata_delref, - ata_kill_pending, - NULL, + .bustype_type = SCSIPI_BUSTYPE_ATA, + .ata_bio = wdc_ata_bio, + .ata_reset_drive = wdc_reset_drive, + .ata_reset_channel = wdc_reset_channel, + .ata_exec_command = wdc_exec_command, + .ata_get_params = ata_get_params, + .ata_addref = wdc_ata_addref, + .ata_delref = wdc_ata_delref, + .ata_killpending = ata_kill_pending, + .ata_recovery = NULL, }; static const struct ata_xfer_ops wdc_bio_xfer_ops = { diff --git a/sys/dev/ic/ahcisata_core.c b/sys/dev/ic/ahcisata_core.c index 216aef0731e..100cd40fd91 100644 --- a/sys/dev/ic/ahcisata_core.c +++ b/sys/dev/ic/ahcisata_core.c @@ -1,4 +1,4 @@ -/* $NetBSD: ahcisata_core.c,v 1.85 2020/12/20 00:14:30 jmcneill Exp $ */ +/* $NetBSD: ahcisata_core.c,v 1.86 2020/12/25 08:55:40 skrll Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.85 2020/12/20 00:14:30 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.86 2020/12/25 08:55:40 skrll Exp $"); #include <sys/types.h> #include <sys/malloc.h> @@ -113,16 +113,16 @@ static const struct scsipi_bustype ahci_atapi_bustype = { #define AHCI_RST_WAIT (ATA_RESET_DELAY / 10) const struct ata_bustype ahci_ata_bustype = { - SCSIPI_BUSTYPE_ATA, - ahci_ata_bio, - ahci_reset_drive, - ahci_reset_channel, - ahci_exec_command, - ata_get_params, - ahci_ata_addref, - ahci_ata_delref, - ahci_killpending, - ahci_channel_recover, + .bustype_type = SCSIPI_BUSTYPE_ATA, + .ata_bio = ahci_ata_bio, + .ata_reset_drive = ahci_reset_drive, + .ata_reset_channel = ahci_reset_channel, + .ata_exec_command = ahci_exec_command, + .ata_get_params = ata_get_params, + .ata_addref = ahci_ata_addref, + .ata_delref = ahci_ata_delref, + .ata_killpending = ahci_killpending, + .ata_recovery = ahci_channel_recover, }; static void ahci_setup_port(struct ahci_softc *sc, int i); |
