diff options
| author |   krw <krw@openbsd.org> | 2020-07-19 18:57:57 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-07-19 18:57:57 +0000 |
| commit | ead808c42040dde55a8ea2938802849f628f2859 (patch) | |
| tree | eaa6027c39fae179c81fd6469d744349804e203a /sys/dev/softraid.c | |
| parent | Should use ufs_args here after all. (diff) | |
| download | wireguard-openbsd-ead808c42040dde55a8ea2938802849f628f2859.tar.xz wireguard-openbsd-ead808c42040dde55a8ea2938802849f628f2859.zip | |
Move the adapter related items (luns, adapter, adapter_target,
adapter_buswidth, adapter_softc) from struct scsi_link to struct
scsibus_attach_args.
Additional compile tests by jmatthew@ (sparc64) and aoyam@ (luna88k).
Diffstat (limited to 'sys/dev/softraid.c')
| -rw-r--r-- | sys/dev/softraid.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index 7a3774b861e..a42c676e2f6 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.408 2020/07/16 21:18:29 krw Exp $ */ +/* $OpenBSD: softraid.c,v 1.409 2020/07/19 18:57:57 krw Exp $ */ /* * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -1802,13 +1802,12 @@ sr_attach(struct device *parent, struct device *self, void *aux) printf("\n"); - sc->sc_link.adapter_softc = sc; - sc->sc_link.adapter = &sr_switch; - sc->sc_link.adapter_target = SDEV_NO_ADAPTER_TARGET; - sc->sc_link.adapter_buswidth = SR_MAX_LD; - sc->sc_link.luns = 1; - saa.saa_sc_link = &sc->sc_link; + saa.saa_adapter_softc = sc; + saa.saa_adapter = &sr_switch; + saa.saa_adapter_target = SDEV_NO_ADAPTER_TARGET; + saa.saa_adapter_buswidth = SR_MAX_LD; + saa.saa_luns = 1; sc->sc_scsibus = (struct scsibus_softc *)config_found(&sc->sc_dev, &saa, scsiprint); |