Flush the queue of minor fixes to pst.

3 files changed, 3 insertions, 5 deletions

diff --git a/sys/dev/pst/pst-iop.h b/sys/dev/pst/pst-iop.h
index 9badbf8..57f0504 100644
--- a/sys/dev/pst/pst-iop.h
+++ b/sys/dev/pst/pst-iop.h
@@ -42,7 +42,6 @@ struct iop_softc {
     struct resource		*r_mem;
     struct resource		*r_irq;
     caddr_t			ibase;
-    u_int32_t			phys_ibase;
     caddr_t			obase;
     u_int32_t			phys_obase;
     struct i2o_registers	*reg;
diff --git a/sys/dev/pst/pst-pci.c b/sys/dev/pst/pst-pci.c
index 15dd337..9d97280 100644
--- a/sys/dev/pst/pst-pci.c
+++ b/sys/dev/pst/pst-pci.c
@@ -93,7 +93,6 @@ iop_pci_attach(device_t dev)
 		     PCIM_CMD_MEMEN | PCIM_CMD_BUSMASTEREN, 1);
 
     sc->ibase = rman_get_virtual(sc->r_mem);
-    sc->phys_ibase = vtophys(sc->ibase);
     sc->reg = (struct i2o_registers *)sc->ibase;
     sc->dev = dev;
     mtx_init(&sc->mtx, "pst lock", MTX_DEF, 0);
diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c
index 83a5280..f14be91 100644
--- a/sys/dev/pst/pst-raid.c
+++ b/sys/dev/pst/pst-raid.c
@@ -123,11 +123,11 @@ pst_attach(device_t dev)
 
     if (!(psc->info = (struct i2o_bsa_device *)
 	    malloc(sizeof(struct i2o_bsa_device), M_PSTRAID, M_NOWAIT))) {
-	contigfree(reply, PAGE_SIZE, M_PSTRAID);
+	contigfree(reply, PAGE_SIZE, M_PSTIOP);
 	return ENOMEM;
     }
     bcopy(reply->result, psc->info, sizeof(struct i2o_bsa_device));
-    contigfree(reply, PAGE_SIZE, M_PSTRAID);
+    contigfree(reply, PAGE_SIZE, M_PSTIOP);
 
     if (!(reply = iop_get_util_params(psc->iop, psc->lct->local_tid,
 				      I2O_PARAMS_OPERATION_FIELD_GET,
@@ -145,7 +145,7 @@ pst_attach(device_t dev)
     bpack(ident->vendor, ident->vendor, 16);
     bpack(ident->product, ident->product, 16);
     sprintf(name, "%s %s", ident->vendor, ident->product);
-    contigfree(reply, PAGE_SIZE, M_PSTRAID);
+    contigfree(reply, PAGE_SIZE, M_PSTIOP);
 
     bioq_init(&psc->queue);