Staging: hv: rename hyperv_utils.c to hv_utils.c

As the module only has one .c file in it, just name the file
the same as the desired module.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile
index 7a57a88..1ac5083 100644 (file)
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@ -10,4 +10,3 @@ hv_vmbus-objs := vmbus_drv.o osd.o \
 hv_storvsc-objs := storvsc_drv.o StorVsc.o
 hv_blkvsc-objs := blkvsc_drv.o BlkVsc.o
 hv_netvsc-objs := netvsc_drv.o NetVsc.o RndisFilter.o
-hv_utils-objs := hyperv_utils.o

diff --git a/drivers/staging/hv/hv_utils.c b/drivers/staging/hv/hv_utils.c
new file mode 100644 (file)
index 0000000..d3fc33e
--- /dev/null
+++ b/drivers/staging/hv/hv_utils.c
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2010, Microsoft Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * Authors:
+ *   Haiyang Zhang <haiyangz@microsoft.com>
+ *   Hank Janssen  <hjanssen@microsoft.com>
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/sysctl.h>
+#include <linux/reboot.h>
+
+#include "logging.h"
+#include "osd.h"
+#include "vmbus.h"
+#include "VmbusPacketFormat.h"
+#include "VmbusChannelInterface.h"
+#include "VersionInfo.h"
+#include "Channel.h"
+#include "VmbusPrivate.h"
+#include "VmbusApi.h"
+#include "utils.h"
+
+
+static void shutdown_onchannelcallback(void *context)
+{
+       struct vmbus_channel *channel = context;
+       u8 *buf;
+       u32 buflen, recvlen;
+       u64 requestid;
+       u8  execute_shutdown = false;
+
+       struct shutdown_msg_data *shutdown_msg;
+
+       struct icmsg_hdr *icmsghdrp;
+       struct icmsg_negotiate *negop = NULL;
+
+       DPRINT_ENTER(VMBUS);
+
+       buflen = PAGE_SIZE;
+       buf = kmalloc(buflen, GFP_ATOMIC);
+
+       VmbusChannelRecvPacket(channel, buf, buflen, &recvlen, &requestid);
+
+       if (recvlen > 0) {
+               DPRINT_DBG(VMBUS, "shutdown packet: len=%d, requestid=%lld",
+                          recvlen, requestid);
+
+               icmsghdrp = (struct icmsg_hdr *)&buf[
+                       sizeof(struct vmbuspipe_hdr)];
+
+               if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) {
+                       prep_negotiate_resp(icmsghdrp, negop, buf);
+               } else {
+                       shutdown_msg = (struct shutdown_msg_data *)&buf[
+                               sizeof(struct vmbuspipe_hdr) +
+                               sizeof(struct icmsg_hdr)];
+
+                       switch (shutdown_msg->flags) {
+                       case 0:
+                       case 1:
+                               icmsghdrp->status = HV_S_OK;
+                               execute_shutdown = true;
+
+                               DPRINT_INFO(VMBUS, "Shutdown request received -"
+                                           " gracefull shutdown initiated");
+                               break;
+                       default:
+                               icmsghdrp->status = HV_E_FAIL;
+                               execute_shutdown = false;
+
+                               DPRINT_INFO(VMBUS, "Shutdown request received -"
+                                           " Invalid request");
+                               break;
+                       };
+               }
+
+               icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION
+                       | ICMSGHDRFLAG_RESPONSE;
+
+               VmbusChannelSendPacket(channel, buf,
+                                      recvlen, requestid,
+                                      VmbusPacketTypeDataInBand, 0);
+       }
+
+       kfree(buf);
+
+       DPRINT_EXIT(VMBUS);
+
+       if (execute_shutdown == true)
+               orderly_poweroff(false);
+}
+
+
+/*
+ * Synchronize time with host after reboot, restore, etc.
+ */
+static void adj_guesttime(u64 hosttime, u8 flags)
+{
+       s64 host_tns;
+       struct timespec host_ts;
+       static s32 scnt = 50;
+
+       host_tns = (hosttime - WLTIMEDELTA) * 100;
+       host_ts = ns_to_timespec(host_tns);
+
+       if ((flags & ICTIMESYNCFLAG_SYNC) != 0) {
+               do_settimeofday(&host_ts);
+               return;
+       }
+
+       if ((flags & ICTIMESYNCFLAG_SAMPLE) != 0 &&
+           scnt > 0) {
+               scnt--;
+               do_settimeofday(&host_ts);
+       }
+
+       return;
+}
+
+/*
+ * Time Sync Channel message handler.
+ */
+static void timesync_onchannelcallback(void *context)
+{
+       struct vmbus_channel *channel = context;
+       u8 *buf;
+       u32 buflen, recvlen;
+       u64 requestid;
+       struct icmsg_hdr *icmsghdrp;
+       struct ictimesync_data *timedatap;
+
+       DPRINT_ENTER(VMBUS);
+
+       buflen = PAGE_SIZE;
+       buf = kmalloc(buflen, GFP_ATOMIC);
+
+       VmbusChannelRecvPacket(channel, buf, buflen, &recvlen, &requestid);
+
+       if (recvlen > 0) {
+               DPRINT_DBG(VMBUS, "timesync packet: recvlen=%d, requestid=%lld",
+                       recvlen, requestid);
+
+               icmsghdrp = (struct icmsg_hdr *)&buf[
+                               sizeof(struct vmbuspipe_hdr)];
+
+               if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) {
+                       prep_negotiate_resp(icmsghdrp, NULL, buf);
+               } else {
+                       timedatap = (struct ictimesync_data *)&buf[
+                               sizeof(struct vmbuspipe_hdr) +
+                               sizeof(struct icmsg_hdr)];
+                       adj_guesttime(timedatap->parenttime, timedatap->flags);
+               }
+
+               icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION
+                       | ICMSGHDRFLAG_RESPONSE;
+
+               VmbusChannelSendPacket(channel, buf,
+                               recvlen, requestid,
+                               VmbusPacketTypeDataInBand, 0);
+       }
+
+       kfree(buf);
+
+       DPRINT_EXIT(VMBUS);
+}
+
+
+static int __init init_hyperv_utils(void)
+{
+       printk(KERN_INFO "Registering HyperV Utility Driver\n");
+
+       hv_cb_utils[HV_SHUTDOWN_MSG].channel->OnChannelCallback =
+               &shutdown_onchannelcallback;
+       hv_cb_utils[HV_SHUTDOWN_MSG].callback = &shutdown_onchannelcallback;
+
+       hv_cb_utils[HV_TIMESYNC_MSG].channel->OnChannelCallback =
+               &timesync_onchannelcallback;
+       hv_cb_utils[HV_TIMESYNC_MSG].callback = &timesync_onchannelcallback;
+
+       return 0;
+}
+
+static void exit_hyperv_utils(void)
+{
+       printk(KERN_INFO "De-Registered HyperV Utility Driver\n");
+
+       hv_cb_utils[HV_SHUTDOWN_MSG].channel->OnChannelCallback =
+               &chn_cb_negotiate;
+       hv_cb_utils[HV_SHUTDOWN_MSG].callback = &chn_cb_negotiate;
+
+       hv_cb_utils[HV_TIMESYNC_MSG].channel->OnChannelCallback =
+               &chn_cb_negotiate;
+       hv_cb_utils[HV_TIMESYNC_MSG].callback = &chn_cb_negotiate;
+}
+
+module_init(init_hyperv_utils);
+module_exit(exit_hyperv_utils);
+
+MODULE_DESCRIPTION("Hyper-V Utilities");
+MODULE_VERSION(HV_DRV_VERSION);
+MODULE_LICENSE("GPL");

diff --git a/drivers/staging/hv/hyperv_utils.c b/drivers/staging/hv/hyperv_utils.c
deleted file mode 100644 (file)
index d3fc33e..0000000
--- a/drivers/staging/hv/hyperv_utils.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2010, Microsoft Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307 USA.
- *
- * Authors:
- *   Haiyang Zhang <haiyangz@microsoft.com>
- *   Hank Janssen  <hjanssen@microsoft.com>
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/sysctl.h>
-#include <linux/reboot.h>
-
-#include "logging.h"
-#include "osd.h"
-#include "vmbus.h"
-#include "VmbusPacketFormat.h"
-#include "VmbusChannelInterface.h"
-#include "VersionInfo.h"
-#include "Channel.h"
-#include "VmbusPrivate.h"
-#include "VmbusApi.h"
-#include "utils.h"
-
-
-static void shutdown_onchannelcallback(void *context)
-{
-       struct vmbus_channel *channel = context;
-       u8 *buf;
-       u32 buflen, recvlen;
-       u64 requestid;
-       u8  execute_shutdown = false;
-
-       struct shutdown_msg_data *shutdown_msg;
-
-       struct icmsg_hdr *icmsghdrp;
-       struct icmsg_negotiate *negop = NULL;
-
-       DPRINT_ENTER(VMBUS);
-
-       buflen = PAGE_SIZE;
-       buf = kmalloc(buflen, GFP_ATOMIC);
-
-       VmbusChannelRecvPacket(channel, buf, buflen, &recvlen, &requestid);
-
-       if (recvlen > 0) {
-               DPRINT_DBG(VMBUS, "shutdown packet: len=%d, requestid=%lld",
-                          recvlen, requestid);
-
-               icmsghdrp = (struct icmsg_hdr *)&buf[
-                       sizeof(struct vmbuspipe_hdr)];
-
-               if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) {
-                       prep_negotiate_resp(icmsghdrp, negop, buf);
-               } else {
-                       shutdown_msg = (struct shutdown_msg_data *)&buf[
-                               sizeof(struct vmbuspipe_hdr) +
-                               sizeof(struct icmsg_hdr)];
-
-                       switch (shutdown_msg->flags) {
-                       case 0:
-                       case 1:
-                               icmsghdrp->status = HV_S_OK;
-                               execute_shutdown = true;
-
-                               DPRINT_INFO(VMBUS, "Shutdown request received -"
-                                           " gracefull shutdown initiated");
-                               break;
-                       default:
-                               icmsghdrp->status = HV_E_FAIL;
-                               execute_shutdown = false;
-
-                               DPRINT_INFO(VMBUS, "Shutdown request received -"
-                                           " Invalid request");
-                               break;
-                       };
-               }
-
-               icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION
-                       | ICMSGHDRFLAG_RESPONSE;
-
-               VmbusChannelSendPacket(channel, buf,
-                                      recvlen, requestid,
-                                      VmbusPacketTypeDataInBand, 0);
-       }
-
-       kfree(buf);
-
-       DPRINT_EXIT(VMBUS);
-
-       if (execute_shutdown == true)
-               orderly_poweroff(false);
-}
-
-
-/*
- * Synchronize time with host after reboot, restore, etc.
- */
-static void adj_guesttime(u64 hosttime, u8 flags)
-{
-       s64 host_tns;
-       struct timespec host_ts;
-       static s32 scnt = 50;
-
-       host_tns = (hosttime - WLTIMEDELTA) * 100;
-       host_ts = ns_to_timespec(host_tns);
-
-       if ((flags & ICTIMESYNCFLAG_SYNC) != 0) {
-               do_settimeofday(&host_ts);
-               return;
-       }
-
-       if ((flags & ICTIMESYNCFLAG_SAMPLE) != 0 &&
-           scnt > 0) {
-               scnt--;
-               do_settimeofday(&host_ts);
-       }
-
-       return;
-}
-
-/*
- * Time Sync Channel message handler.
- */
-static void timesync_onchannelcallback(void *context)
-{
-       struct vmbus_channel *channel = context;
-       u8 *buf;
-       u32 buflen, recvlen;
-       u64 requestid;
-       struct icmsg_hdr *icmsghdrp;
-       struct ictimesync_data *timedatap;
-
-       DPRINT_ENTER(VMBUS);
-
-       buflen = PAGE_SIZE;
-       buf = kmalloc(buflen, GFP_ATOMIC);
-
-       VmbusChannelRecvPacket(channel, buf, buflen, &recvlen, &requestid);
-
-       if (recvlen > 0) {
-               DPRINT_DBG(VMBUS, "timesync packet: recvlen=%d, requestid=%lld",
-                       recvlen, requestid);
-
-               icmsghdrp = (struct icmsg_hdr *)&buf[
-                               sizeof(struct vmbuspipe_hdr)];
-
-               if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) {
-                       prep_negotiate_resp(icmsghdrp, NULL, buf);
-               } else {
-                       timedatap = (struct ictimesync_data *)&buf[
-                               sizeof(struct vmbuspipe_hdr) +
-                               sizeof(struct icmsg_hdr)];
-                       adj_guesttime(timedatap->parenttime, timedatap->flags);
-               }
-
-               icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION
-                       | ICMSGHDRFLAG_RESPONSE;
-
-               VmbusChannelSendPacket(channel, buf,
-                               recvlen, requestid,
-                               VmbusPacketTypeDataInBand, 0);
-       }
-
-       kfree(buf);
-
-       DPRINT_EXIT(VMBUS);
-}
-
-
-static int __init init_hyperv_utils(void)
-{
-       printk(KERN_INFO "Registering HyperV Utility Driver\n");
-
-       hv_cb_utils[HV_SHUTDOWN_MSG].channel->OnChannelCallback =
-               &shutdown_onchannelcallback;
-       hv_cb_utils[HV_SHUTDOWN_MSG].callback = &shutdown_onchannelcallback;
-
-       hv_cb_utils[HV_TIMESYNC_MSG].channel->OnChannelCallback =
-               &timesync_onchannelcallback;
-       hv_cb_utils[HV_TIMESYNC_MSG].callback = &timesync_onchannelcallback;
-
-       return 0;
-}
-
-static void exit_hyperv_utils(void)
-{
-       printk(KERN_INFO "De-Registered HyperV Utility Driver\n");
-
-       hv_cb_utils[HV_SHUTDOWN_MSG].channel->OnChannelCallback =
-               &chn_cb_negotiate;
-       hv_cb_utils[HV_SHUTDOWN_MSG].callback = &chn_cb_negotiate;
-
-       hv_cb_utils[HV_TIMESYNC_MSG].channel->OnChannelCallback =
-               &chn_cb_negotiate;
-       hv_cb_utils[HV_TIMESYNC_MSG].callback = &chn_cb_negotiate;
-}
-
-module_init(init_hyperv_utils);
-module_exit(exit_hyperv_utils);
-
-MODULE_DESCRIPTION("Hyper-V Utilities");
-MODULE_VERSION(HV_DRV_VERSION);
-MODULE_LICENSE("GPL");