diff options
author | Andriy Gapon <avg@FreeBSD.org> | 2021-11-26 14:00:45 +0000 |
---|---|---|
committer | Andriy Gapon <avg@FreeBSD.org> | 2021-12-13 11:40:47 +0000 |
commit | df472af034e7726dea533ac7f44440dad4ba6a34 (patch) | |
tree | 3a6ea78cc7821d7b694ea0c0682139ceb5dc18aa /sys/cam | |
parent | 1256067c5c575474e626e5f119f50275ea2d975e (diff) | |
download | src-df472af034e7726dea533ac7f44440dad4ba6a34.tar.gz src-df472af034e7726dea533ac7f44440dad4ba6a34.zip |
Diffstat (limited to 'sys/cam')
-rw-r--r-- | sys/cam/mmc/mmc_sim.c | 9 | ||||
-rw-r--r-- | sys/cam/mmc/mmc_sim.h | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/cam/mmc/mmc_sim.c b/sys/cam/mmc/mmc_sim.c index 45d706f61d0a..792551a93511 100644 --- a/sys/cam/mmc/mmc_sim.c +++ b/sys/cam/mmc/mmc_sim.c @@ -191,7 +191,6 @@ mmc_cam_sim_default_action(struct cam_sim *sim, union ccb *ccb) int mmc_cam_sim_alloc(device_t dev, const char *name, struct mmc_sim *mmc_sim) { - char sim_name[64], mtx_name[64]; mmc_sim->dev = dev; @@ -199,13 +198,11 @@ mmc_cam_sim_alloc(device_t dev, const char *name, struct mmc_sim *mmc_sim) goto fail; } - snprintf(sim_name, sizeof(sim_name), "%s_sim", name); - snprintf(mtx_name, sizeof(mtx_name), "%s_mtx", name); - - mtx_init(&mmc_sim->mtx, sim_name, NULL, MTX_DEF); + snprintf(mmc_sim->name, sizeof(mmc_sim->name), "%s_sim", name); + mtx_init(&mmc_sim->mtx, mmc_sim->name, NULL, MTX_DEF); mmc_sim->sim = cam_sim_alloc(mmc_cam_sim_default_action, mmc_cam_default_poll, - name, mmc_sim, device_get_unit(dev), + 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_sim.h b/sys/cam/mmc/mmc_sim.h index 2b1159a9758e..10bd183c307d 100644 --- a/sys/cam/mmc/mmc_sim.h +++ b/sys/cam/mmc/mmc_sim.h @@ -33,6 +33,7 @@ struct mmc_sim { struct mmc_cam_sim_softc *sc; struct mtx mtx; + char name[64]; struct cam_devq *devq; struct cam_sim *sim; device_t dev; |