summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2018-10-20 18:07:46 +0300
committerToomas Soome <tsoome@me.com>2019-09-20 12:58:10 +0300
commit067a68e3f9f9695a8a52350c0179d29947040ff8 (patch)
tree49f8a3f015d9fe1b5d6b15e38e4905b8600f27b1
parentb79609a5823c681de453be676098d9635305e6a7 (diff)
downloadillumos-joyent-067a68e3f9f9695a8a52350c0179d29947040ff8.tar.gz
11592 sdp: cast between incompatible function types
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com> Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r--usr/src/uts/common/io/ib/clients/sdp/sdpddi.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/usr/src/uts/common/io/ib/clients/sdp/sdpddi.c b/usr/src/uts/common/io/ib/clients/sdp/sdpddi.c
index 16aab2d75e..6ccd9a648c 100644
--- a/usr/src/uts/common/io/ib/clients/sdp/sdpddi.c
+++ b/usr/src/uts/common/io/ib/clients/sdp/sdpddi.c
@@ -126,7 +126,7 @@ sdp_gen_open(queue_t *q, dev_t *devp, int flag, int sflag, cred_t *credp)
/* open routine. */
/*ARGSUSED*/
static int
-sdp_gen_close(queue_t *q, dev_t *devp, int flag, int sflag, cred_t *credp)
+sdp_gen_close(queue_t *q, int flag, cred_t *credp)
{
qprocsoff(q);
return (0);
@@ -250,7 +250,7 @@ done:
/*
* Received a put from sockfs. We only support ndd get/set
*/
-static void
+static int
sdp_gen_wput(queue_t *q, mblk_t *mp)
{
switch (mp->b_datap->db_type) {
@@ -266,8 +266,9 @@ sdp_gen_wput(queue_t *q, mblk_t *mp)
break;
default:
freemsg(mp);
- return;
+ return (0);
}
+ return (0);
}
static struct module_info info = {
@@ -275,12 +276,12 @@ static struct module_info info = {
};
static struct qinit rinit = {
- NULL, (pfi_t)NULL, (pfi_t)sdp_gen_open, (pfi_t)sdp_gen_close, NULL,
+ NULL, NULL, sdp_gen_open, sdp_gen_close, NULL,
&info, NULL, NULL, NULL, STRUIOT_NONE
};
static struct qinit winit = {
- (pfi_t)sdp_gen_wput, NULL, (pfi_t)sdp_gen_open, (pfi_t)sdp_gen_close,
+ sdp_gen_wput, NULL, sdp_gen_open, sdp_gen_close,
NULL, &info, NULL, NULL, NULL, STRUIOT_NONE
};