diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-07-20 14:41:15 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-07-20 14:41:15 +0000 |
| commit | ad566d2094b0373bebd00ab85e0010d5811c4249 (patch) | |
| tree | 46059b2470122630651df70bd0636206b91194c5 /sys/dev/ata/atascsi.c | |
| parent | a746810173b252aec797706a98c4166c8c58aa2d (diff) | |
Move remaining scsi bus initialization info from "prototype scsi link"
fields to struct scsibus_attach_args. Nuke the struct scsi_link *
(saa_sc_link) in scaibus_attach_args.
Explicitly initialize each field in scsibus_attach_args variables.
Diffstat (limited to 'sys/dev/ata/atascsi.c')
| -rw-r--r-- | sys/dev/ata/atascsi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c index b5df0df16b8..4a1a0008fd7 100644 --- a/sys/dev/ata/atascsi.c +++ b/sys/dev/ata/atascsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atascsi.c,v 1.141 2020/07/19 18:57:57 krw Exp $ */ +/* $OpenBSD: atascsi.c,v 1.142 2020/07/20 14:41:12 krw Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -182,14 +182,15 @@ atascsi_attach(struct device *self, struct atascsi_attach_args *aaa) as->as_host_ports = mallocarray(aaa->aaa_nports, sizeof(struct atascsi_host_port *), M_DEVBUF, M_WAITOK | M_ZERO); - as->as_link.openings = 1; - - saa.saa_sc_link = &as->as_link; saa.saa_adapter = &as->as_switch; saa.saa_adapter_softc = as; saa.saa_adapter_buswidth = aaa->aaa_nports; saa.saa_luns = SATA_PMP_MAX_PORTS; saa.saa_adapter_target = SDEV_NO_ADAPTER_TARGET; + saa.saa_openings = 1; + saa.saa_pool = NULL; + saa.saa_quirks = saa.saa_flags = 0; + saa.saa_wwpn = saa.saa_wwnn = 0; as->as_scsibus = (struct scsibus_softc *)config_found(self, &saa, scsiprint); |