Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
13773 zs: cast between incompatible function types
Reviewed by: C Fraire <cfraire@me.com>
Reviewed by: Andy Fiddaman <andy@omnios.org>
Approved by: Dan McDonald <danmcd@joyent.com>
  • Loading branch information
tsoome committed May 10, 2021
1 parent e3d11ee commit 2696d28
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions usr/src/uts/sun/io/zs_async.c
Expand Up @@ -445,8 +445,8 @@ int zsa_h_log_n[40];

static int zsa_open(queue_t *rq, dev_t *dev, int flag, int sflag, cred_t *cr);
static int zsa_close(queue_t *q, int flag, cred_t *cr);
static void zsa_wput(queue_t *q, mblk_t *mp);
static void zsa_rsrv(queue_t *q);
static int zsa_wput(queue_t *q, mblk_t *mp);
static int zsa_rsrv(queue_t *q);

static struct module_info asyncm_info = {
0,
Expand All @@ -459,7 +459,7 @@ static struct module_info asyncm_info = {

static struct qinit async_rinit = {
putq,
(int (*)())zsa_rsrv,
zsa_rsrv,
zsa_open,
zsa_close,
NULL,
Expand All @@ -468,7 +468,7 @@ static struct qinit async_rinit = {
};

static struct qinit async_winit = {
(int (*)())zsa_wput,
zsa_wput,
NULL,
NULL,
NULL,
Expand Down Expand Up @@ -1201,7 +1201,7 @@ zsa_close(queue_t *q, int flag, cred_t *cr __unused)
* It expects that these functions are handled in upper module(s),
* as we do in ldterm.
*/
static void
static int
zsa_wput(queue_t *q, mblk_t *mp)
{
struct asyncline *za;
Expand Down Expand Up @@ -1609,12 +1609,13 @@ zsa_wput(queue_t *q, mblk_t *mp)
freemsg(mp);
break;
}
return (0);
}

/*
* zs read service procedure
*/
static void
static int
zsa_rsrv(queue_t *q)
{
struct asyncline *za;
Expand All @@ -1627,6 +1628,7 @@ zsa_rsrv(queue_t *q)
ZSSETSOFT(zs);
mutex_exit(zs->zs_excl_hi);
}
return (0);
}

/*
Expand Down

0 comments on commit 2696d28

Please sign in to comment.