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/pci/mfii.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/pci/mfii.c')
| -rw-r--r-- | sys/dev/pci/mfii.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sys/dev/pci/mfii.c b/sys/dev/pci/mfii.c index 054edaf6c41..b63b840b16b 100644 --- a/sys/dev/pci/mfii.c +++ b/sys/dev/pci/mfii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfii.c,v 1.78 2020/07/19 18:57:58 krw Exp $ */ +/* $OpenBSD: mfii.c,v 1.79 2020/07/20 14:41:13 krw Exp $ */ /* * Copyright (c) 2012 David Gwynne <dlg@openbsd.org> @@ -781,15 +781,15 @@ mfii_attach(struct device *parent, struct device *self, void *aux) if (sc->sc_ih == NULL) goto free_sgl; - sc->sc_link.openings = sc->sc_max_cmds; - sc->sc_link.pool = &sc->sc_iopool; - - saa.saa_sc_link = &sc->sc_link; saa.saa_adapter_softc = sc; saa.saa_adapter = &mfii_switch; saa.saa_adapter_target = SDEV_NO_ADAPTER_TARGET; saa.saa_adapter_buswidth = sc->sc_info.mci_max_lds; saa.saa_luns = 8; + saa.saa_openings = sc->sc_max_cmds; + 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); @@ -908,7 +908,6 @@ int mfii_syspd(struct mfii_softc *sc) { struct scsibus_attach_args saa; - struct scsi_link *link; sc->sc_pd = malloc(sizeof(*sc->sc_pd), M_DEVBUF, M_WAITOK|M_ZERO); if (sc->sc_pd == NULL) @@ -917,16 +916,15 @@ mfii_syspd(struct mfii_softc *sc) if (mfii_dev_handles_update(sc) != 0) goto free_pdsc; - link = &sc->sc_pd->pd_link; - link->openings = sc->sc_max_cmds - 1; - link->pool = &sc->sc_iopool; - - saa.saa_sc_link = link; saa.saa_adapter = &mfii_pd_switch; saa.saa_adapter_softc = sc; saa.saa_adapter_buswidth = MFI_MAX_PD; saa.saa_adapter_target = SDEV_NO_ADAPTER_TARGET; saa.saa_luns = 8; + 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_pd->pd_scsibus = (struct scsibus_softc *) config_found(&sc->sc_dev, &saa, scsiprint); |