diff options
| author |   krw <krw@openbsd.org> | 2020-07-03 13:31:47 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-07-03 13:31:47 +0000 |
| commit | 185ff9970d93e54554122f284ca468b0c75db39e (patch) | |
| tree | a4914c53d5981f8de6ff347d5116aad8e4d851f0 | |
| parent | More powerpc64 sets. (diff) | |
| download | wireguard-openbsd-185ff9970d93e54554122f284ca468b0c75db39e.tar.xz wireguard-openbsd-185ff9970d93e54554122f284ca468b0c75db39e.zip | |
Pass the expected 'scsibus_attach_args *' to scsibus_attach() via
config_found(), not a 'scsi_link *'. Part of matthew@'s 2010 work.
| -rw-r--r-- | sys/dev/sdmmc/sdmmc_scsi.c | 4 | ||||
| -rw-r--r-- | sys/dev/sdmmc/sdmmcvar.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/sdmmc/sdmmc_scsi.c b/sys/dev/sdmmc/sdmmc_scsi.c index 3a45a35cfda..2259f7eab29 100644 --- a/sys/dev/sdmmc/sdmmc_scsi.c +++ b/sys/dev/sdmmc/sdmmc_scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sdmmc_scsi.c,v 1.46 2020/02/20 16:26:01 krw Exp $ */ +/* $OpenBSD: sdmmc_scsi.c,v 1.47 2020/07/03 13:31:47 krw Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -146,7 +146,7 @@ sdmmc_scsi_attach(struct sdmmc_softc *sc) scbus->sc_link.pool = &scbus->sc_iopool; bzero(&saa, sizeof(saa)); - saa.scsi_link = &scbus->sc_link; + saa.saa.saa_sc_link = &scbus->sc_link; scbus->sc_child = config_found(&sc->sc_dev, &saa, scsiprint); if (scbus->sc_child == NULL) { diff --git a/sys/dev/sdmmc/sdmmcvar.h b/sys/dev/sdmmc/sdmmcvar.h index e5f4f385cdd..61dc0dad74d 100644 --- a/sys/dev/sdmmc/sdmmcvar.h +++ b/sys/dev/sdmmc/sdmmcvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sdmmcvar.h,v 1.32 2019/04/02 07:08:40 stsp Exp $ */ +/* $OpenBSD: sdmmcvar.h,v 1.33 2020/07/03 13:31:47 krw Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -223,8 +223,8 @@ struct sdmmc_softc { * Attach devices at the sdmmc bus. */ struct sdmmc_attach_args { - struct scsi_link *scsi_link; /* XXX */ - struct sdmmc_function *sf; + struct scsibus_attach_args saa; + struct sdmmc_function *sf; }; #define IPL_SDMMC IPL_BIO |