summaryrefslogtreecommitdiff
path: root/sys/dev/pci/mpii.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2020-07-20 14:41:15 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2020-07-20 14:41:15 +0000
commitad566d2094b0373bebd00ab85e0010d5811c4249 (patch)
tree46059b2470122630651df70bd0636206b91194c5 /sys/dev/pci/mpii.c
parenta746810173b252aec797706a98c4166c8c58aa2d (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/pci/mpii.c')
-rw-r--r--sys/dev/pci/mpii.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c
index 714cc2436b7..5ea23509e20 100644
--- a/sys/dev/pci/mpii.c
+++ b/sys/dev/pci/mpii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpii.c,v 1.136 2020/07/19 18:57:58 krw Exp $ */
+/* $OpenBSD: mpii.c,v 1.137 2020/07/20 14:41:13 krw Exp $ */
/*
* Copyright (c) 2010, 2012 Mike Belopuhov
* Copyright (c) 2009 James Giannoules
@@ -590,15 +590,15 @@ mpii_attach(struct device *parent, struct device *self, void *aux)
sc->sc_pending = 1;
config_pending_incr();
- sc->sc_link.openings = sc->sc_max_cmds - 1;
- sc->sc_link.pool = &sc->sc_iopool;
-
- saa.saa_sc_link = &sc->sc_link;
saa.saa_adapter = &mpii_switch;
saa.saa_adapter_softc = sc;
saa.saa_adapter_target = SDEV_NO_ADAPTER_TARGET;
saa.saa_adapter_buswidth = sc->sc_max_devices;
saa.saa_luns = 1;
+ saa.saa_openings = sc->sc_max_cmds - 1;
+ saa.saa_pool = &sc->sc_iopool;
+ saa.saa_quirks = saa.saa_flags = 0;
+ saa.saa_wwpn = saa.saa_wwnn = 0;
sc->sc_scsibus = (struct scsibus_softc *) config_found(&sc->sc_dev,
&saa, scsiprint);