diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2013-09-25 01:48:45 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2013-09-25 01:48:45 +0000 |
| commit | 0082e54e9d0d882a4eab9c6c0de71ac8c891dcef (patch) | |
| tree | 4ba80487d8d5ba6364f0f8d1bdf5ad85102180c3 /sys/dev/iir | |
| parent | f9c8a14ba2ef7032b29b95020eff7fd88e1f26fe (diff) | |
Notes
Diffstat (limited to 'sys/dev/iir')
| -rw-r--r-- | sys/dev/iir/iir.c | 5 | ||||
| -rw-r--r-- | sys/dev/iir/iir.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c index 1090042ff511..684fce3298e1 100644 --- a/sys/dev/iir/iir.c +++ b/sys/dev/iir/iir.c @@ -270,7 +270,6 @@ iir_init(struct gdt_softc *gdt) gccb->gc_map_flag = TRUE; gccb->gc_scratch = &gdt->sc_gcscratch[GDT_SCRATCH_SZ * i]; gccb->gc_scratch_busbase = gdt->sc_gcscratch_busbase + GDT_SCRATCH_SZ * i; - callout_handle_init(&gccb->gc_timeout_ch); SLIST_INSERT_HEAD(&gdt->sc_free_gccb, gccb, sle); } gdt->sc_init_level++; @@ -1240,7 +1239,7 @@ gdtexecuteccb(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error) ccb->ccb_h.status |= CAM_SIM_QUEUED; /* timeout handling */ - gccb->gc_timeout_ch = + ccb->ccb_h.timeout_ch = timeout(iir_timeout, (caddr_t)gccb, (ccb->ccb_h.timeout * hz) / 1000); @@ -1748,7 +1747,7 @@ gdt_sync_event(struct gdt_softc *gdt, int service, printf("\n"); return (0); } else { - untimeout(iir_timeout, gccb, gccb->gc_timeout_ch); + untimeout(iir_timeout, gccb, ccb->ccb_h.timeout_ch); if (gdt->sc_status == GDT_S_BSY) { GDT_DPRINTF(GDT_D_DEBUG, ("gdt_sync_event(%p) gccb %p busy\n", gdt, gccb)); diff --git a/sys/dev/iir/iir.h b/sys/dev/iir/iir.h index de7b641257e9..dbae7d2a80f5 100644 --- a/sys/dev/iir/iir.h +++ b/sys/dev/iir/iir.h @@ -684,7 +684,6 @@ struct gdt_ccb { union ccb *gc_ccb; gdt_ucmd_t *gc_ucmd; bus_dmamap_t gc_dmamap; - struct callout_handle gc_timeout_ch; int gc_map_flag; int gc_timeout; u_int8_t gc_service; |