Page MenuHomeFreeBSD

D30858.id.diff
No OneTemporary

D30858.id.diff

diff --git a/sys/cam/cam_sim.h b/sys/cam/cam_sim.h
--- a/sys/cam/cam_sim.h
+++ b/sys/cam/cam_sim.h
@@ -104,7 +104,6 @@
u_int32_t flags;
struct cam_devq *devq; /* Device Queue to use for this SIM */
int refcount; /* References to the SIM. */
- device_t sim_dev; /* For attached peripherals. */
};
static __inline u_int32_t
diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c
--- a/sys/cam/cam_sim.c
+++ b/sys/cam/cam_sim.c
@@ -116,7 +116,6 @@
sim->sim_name = sim_name;
sim->softc = softc;
sim->path_id = CAM_PATH_ANY;
- sim->sim_dev = NULL; /* set only by cam_sim_alloc_dev */
sim->unit_number = unit;
sim->bus_id = 0; /* set in xpt_bus_register */
sim->max_tagged_dev_openings = max_tagged_dev_transactions;
@@ -128,33 +127,6 @@
return (sim);
}
-/**
- * @brief allocate a new sim and fill in the details with a device_t
- *
- * Just like @c cam_sim_alloc, but with an additional paramter.
- *
- * @param dev A newbus device that's associated with the
- * sim. Must be non-NULL.
- */
-struct cam_sim *
-cam_sim_alloc_dev(sim_action_func sim_action, sim_poll_func sim_poll,
- const char *sim_name, void *softc, device_t dev, struct mtx *mtx,
- int max_dev_transactions, int max_tagged_dev_transactions,
- struct cam_devq *queue)
-{
- struct cam_sim *sim;
-
- KASSERT(dev != NULL, ("%s: dev is null for sim_name %s softc %p\n",
- __func__, sim_name, softc));
-
- sim = cam_sim_alloc(sim_action, sim_poll, sim_name, softc,
- device_get_unit(dev), mtx, max_dev_transactions,
- max_tagged_dev_transactions, queue);
- if (sim != NULL)
- sim->sim_dev = dev;
- return (sim);
-}
-
void
cam_sim_free(struct cam_sim *sim, int free_devq)
{

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 13, 12:33 AM (15 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31383610
Default Alt Text
D30858.id.diff (1 KB)

Event Timeline