Flush the queue of minor fixes to pst.
This commit is contained in:
parent
7ce1979be6
commit
d95aa401d5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=135267
@ -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;
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user