diff options
| author | Xin LI <delphij@FreeBSD.org> | 2014-02-27 21:41:52 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2014-02-27 21:41:52 +0000 |
| commit | def7eaf147b736e666f4d31af636075c78796a9f (patch) | |
| tree | 9fd96aaea0875810a0baade611f3f53f99bf0faf /sys/dev/tws | |
| parent | 4170452de39517871af04a140e4b143b6a4600fd (diff) | |
Notes
Diffstat (limited to 'sys/dev/tws')
| -rw-r--r-- | sys/dev/tws/tws.h | 1 | ||||
| -rw-r--r-- | sys/dev/tws/tws_cam.c | 2 | ||||
| -rw-r--r-- | sys/dev/tws/tws_user.c | 5 |
3 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/tws/tws.h b/sys/dev/tws/tws.h index f24b9479343fc..11017300acc0e 100644 --- a/sys/dev/tws/tws.h +++ b/sys/dev/tws/tws.h @@ -248,7 +248,6 @@ struct tws_softc { struct mtx io_lock; /* IO lock */ struct tws_ioctl_lock ioctl_lock; /* ioctl lock */ u_int32_t seq_id; /* Sequence id */ - void *chan; /* IOCTL req wait channel */ struct tws_circular_q aen_q; /* aen q */ struct tws_circular_q trace_q; /* trace q */ struct tws_stats stats; /* I/O stats */ diff --git a/sys/dev/tws/tws_cam.c b/sys/dev/tws/tws_cam.c index b134d760e8132..cb94fee5f246b 100644 --- a/sys/dev/tws/tws_cam.c +++ b/sys/dev/tws/tws_cam.c @@ -1297,7 +1297,7 @@ tws_reinit(void *arg) tws_turn_on_interrupts(sc); - wakeup_one(sc->chan); + wakeup_one(sc); } diff --git a/sys/dev/tws/tws_user.c b/sys/dev/tws/tws_user.c index 223cc07bf0444..53ac7e47ab8ca 100644 --- a/sys/dev/tws/tws_user.c +++ b/sys/dev/tws/tws_user.c @@ -103,8 +103,7 @@ tws_passthru(struct tws_softc *sc, void *buf) do { req = tws_get_request(sc, TWS_REQ_TYPE_PASSTHRU); if ( !req ) { - sc->chan = (void *)sc; - error = tsleep(sc->chan, 0, "tws_sleep", TWS_IOCTL_TIMEOUT*hz); + error = tsleep(sc, 0, "tws_sleep", TWS_IOCTL_TIMEOUT*hz); if ( error == EWOULDBLOCK ) { return(ETIMEDOUT); } @@ -203,7 +202,7 @@ out_data: // req->state = TWS_REQ_STATE_FREE; - wakeup_one(sc->chan); + wakeup_one(sc); return(error); } |