From f5207880ba701d9f4541ba3d9bd4a0c5d813c822 Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Mon, 8 Aug 2016 05:57:38 +0000 Subject: hyperv/ic: Remove never used second parameter of hv_negotiate_version() MFC after: 1 week Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D7422 --- sys/dev/hyperv/utilities/hv_heartbeat.c | 3 +-- sys/dev/hyperv/utilities/hv_shutdown.c | 3 +-- sys/dev/hyperv/utilities/hv_timesync.c | 2 +- sys/dev/hyperv/utilities/hv_util.c | 7 +++---- sys/dev/hyperv/utilities/hv_util.h | 6 ++---- 5 files changed, 8 insertions(+), 13 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/hyperv/utilities/hv_heartbeat.c b/sys/dev/hyperv/utilities/hv_heartbeat.c index 4954d8b89d69..cf279a11c4b4 100644 --- a/sys/dev/hyperv/utilities/hv_heartbeat.c +++ b/sys/dev/hyperv/utilities/hv_heartbeat.c @@ -75,8 +75,7 @@ hv_heartbeat_cb(struct vmbus_channel *channel, void *context) &buf[sizeof(struct hv_vmbus_pipe_hdr)]; if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) { - hv_negotiate_version(icmsghdrp, NULL, buf); - + hv_negotiate_version(icmsghdrp, buf); } else { heartbeat_msg = (struct hv_vmbus_heartbeat_msg_data *) diff --git a/sys/dev/hyperv/utilities/hv_shutdown.c b/sys/dev/hyperv/utilities/hv_shutdown.c index 1dae1228c441..1c4df234f912 100644 --- a/sys/dev/hyperv/utilities/hv_shutdown.c +++ b/sys/dev/hyperv/utilities/hv_shutdown.c @@ -79,8 +79,7 @@ hv_shutdown_cb(struct vmbus_channel *channel, void *context) &buf[sizeof(struct hv_vmbus_pipe_hdr)]; if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) { - hv_negotiate_version(icmsghdrp, NULL, buf); - + hv_negotiate_version(icmsghdrp, buf); } else { shutdown_msg = (struct hv_vmbus_shutdown_msg_data *) diff --git a/sys/dev/hyperv/utilities/hv_timesync.c b/sys/dev/hyperv/utilities/hv_timesync.c index 7ac4fb6c9351..2eb6b3e8b775 100644 --- a/sys/dev/hyperv/utilities/hv_timesync.c +++ b/sys/dev/hyperv/utilities/hv_timesync.c @@ -155,7 +155,7 @@ hv_timesync_cb(struct vmbus_channel *channel, void *context) sizeof(struct hv_vmbus_pipe_hdr)]; if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) { - hv_negotiate_version(icmsghdrp, NULL, time_buf); + hv_negotiate_version(icmsghdrp, time_buf); } else { timedatap = (struct hv_ictimesync_data *) &time_buf[ sizeof(struct hv_vmbus_pipe_hdr) + diff --git a/sys/dev/hyperv/utilities/hv_util.c b/sys/dev/hyperv/utilities/hv_util.c index e398faa75ae6..9ecae82f7aa9 100644 --- a/sys/dev/hyperv/utilities/hv_util.c +++ b/sys/dev/hyperv/utilities/hv_util.c @@ -45,11 +45,10 @@ #include "hv_util.h" void -hv_negotiate_version( - struct hv_vmbus_icmsg_hdr* icmsghdrp, - struct hv_vmbus_icmsg_negotiate* negop, - uint8_t* buf) +hv_negotiate_version(struct hv_vmbus_icmsg_hdr *icmsghdrp, uint8_t *buf) { + struct hv_vmbus_icmsg_negotiate *negop; + icmsghdrp->icmsgsize = 0x10; negop = (struct hv_vmbus_icmsg_negotiate *)&buf[ diff --git a/sys/dev/hyperv/utilities/hv_util.h b/sys/dev/hyperv/utilities/hv_util.h index 09202e79ca5e..0a9f4dc4eee7 100644 --- a/sys/dev/hyperv/utilities/hv_util.h +++ b/sys/dev/hyperv/utilities/hv_util.h @@ -43,11 +43,9 @@ typedef struct hv_util_sc { uint8_t *receive_buffer; } hv_util_sc; -void hv_negotiate_version( - struct hv_vmbus_icmsg_hdr* icmsghdrp, - struct hv_vmbus_icmsg_negotiate* negop, - uint8_t* buf); +void hv_negotiate_version(struct hv_vmbus_icmsg_hdr *icmsghdrp, uint8_t *buf); int hv_util_attach(device_t dev); int hv_util_detach(device_t dev); + #endif -- cgit v1.2.3