The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a72af82e3169fcacfedf9047120679300a4296f8
commit a72af82e3169fcacfedf9047120679300a4296f8 Author: Warner Losh <[email protected]> AuthorDate: 2021-06-28 23:22:35 +0000 Commit: Warner Losh <[email protected]> CommitDate: 2021-06-28 23:22:35 +0000 cam: Fix GENERIC-MMCCAM build Fix forgotten argument and type error. MMCCAM isn't enabled by default, and I'd mistakenly thought it was, so these went undetected precommit. Sponsored by: Netflix --- sys/cam/mmc/mmc_sim.c | 2 +- sys/cam/mmc/mmc_xpt.c | 2 +- sys/dev/sdhci/sdhci.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/cam/mmc/mmc_sim.c b/sys/cam/mmc/mmc_sim.c index 2aae157c9542..0bb4c850f8eb 100644 --- a/sys/cam/mmc/mmc_sim.c +++ b/sys/cam/mmc/mmc_sim.c @@ -206,7 +206,7 @@ mmc_cam_sim_alloc(device_t dev, const char *name, struct mmc_sim *mmc_sim) mtx_init(&mmc_sim->mtx, sim_name, NULL, MTX_DEF); mmc_sim->sim = cam_sim_alloc(mmc_cam_sim_default_action, mmc_cam_default_poll, - name, mmc_sim, + name, mmc_sim, device_get_unit(dev), &mmc_sim->mtx, 1, 1, mmc_sim->devq); if (mmc_sim->sim == NULL) { diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c index c94e74876ed7..a649946f096f 100644 --- a/sys/cam/mmc/mmc_xpt.c +++ b/sys/cam/mmc/mmc_xpt.c @@ -419,7 +419,7 @@ mmccam_start_discovery(struct cam_sim *sim) return; } - KASSERT(xpt_path_sim_device(&ccb->ccb_h.path) != NULL, + KASSERT(xpt_path_sim_device(ccb->ccb_h.path) != NULL, ("%s(%s): device is not initialized on sim's path", __func__, cam_sim_name(sim))); xpt_rescan(ccb); diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c index 1ed521da8a70..bd30175e9f86 100644 --- a/sys/dev/sdhci/sdhci.c +++ b/sys/dev/sdhci/sdhci.c @@ -2484,7 +2484,7 @@ sdhci_start_slot(struct sdhci_slot *slot) mtx_init(&slot->sim_mtx, "sdhcisim", NULL, MTX_DEF); slot->sim = cam_sim_alloc(sdhci_cam_action, sdhci_cam_poll, - "sdhci_slot", slot, + "sdhci_slot", slot, device_get_unit(slot->dev), &slot->sim_mtx, 1, 1, slot->devq); if (slot->sim == NULL) { _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
