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/hptrr | |
| parent | f9c8a14ba2ef7032b29b95020eff7fd88e1f26fe (diff) | |
Notes
Diffstat (limited to 'sys/dev/hptrr')
| -rw-r--r-- | sys/dev/hptrr/hptrr_osm_bsd.c | 5 | ||||
| -rw-r--r-- | sys/dev/hptrr/os_bsd.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/hptrr/hptrr_osm_bsd.c b/sys/dev/hptrr/hptrr_osm_bsd.c index 3d83de60477b..9af256e0d9e8 100644 --- a/sys/dev/hptrr/hptrr_osm_bsd.c +++ b/sys/dev/hptrr/hptrr_osm_bsd.c @@ -440,7 +440,7 @@ static void os_cmddone(PCOMMAND pCmd) KdPrint(("os_cmddone(%p, %d)", pCmd, pCmd->Result)); - untimeout(hpt_timeout, pCmd, ext->timeout_ch); + untimeout(hpt_timeout, pCmd, ccb->ccb_h.timeout_ch); switch(pCmd->Result) { case RETURN_SUCCESS: @@ -519,7 +519,7 @@ static void hpt_io_dmamap_callback(void *arg, bus_dma_segment_t *segs, int nsegs BUS_DMASYNC_PREWRITE); } } - ext->timeout_ch = timeout(hpt_timeout, pCmd, HPT_OSM_TIMEOUT); + ext->ccb->ccb_h.timeout_ch = timeout(hpt_timeout, pCmd, HPT_OSM_TIMEOUT); ldm_queue_cmd(pCmd); } @@ -1058,7 +1058,6 @@ static void hpt_final_init(void *dummy) os_printk("Can't create dma map(%d)", i); return ; } - callout_handle_init(&ext->timeout_ch); } if ((devq = cam_simq_alloc(os_max_queue_comm)) == NULL) { diff --git a/sys/dev/hptrr/os_bsd.h b/sys/dev/hptrr/os_bsd.h index 1c6760e8edaa..ec221f39b90a 100644 --- a/sys/dev/hptrr/os_bsd.h +++ b/sys/dev/hptrr/os_bsd.h @@ -174,7 +174,6 @@ typedef struct _os_cmdext { struct _os_cmdext *next; union ccb *ccb; bus_dmamap_t dma_map; - struct callout_handle timeout_ch; SG psg[os_max_sg_descriptors]; } OS_CMDEXT, *POS_CMDEXT; |