[PATCH 104/117] Staging: hv: storvsc: Cleanup storvsc_drv.c after adding the contents of hyperv_storage.h

K. Y. Srinivasan
2011-07-15T17:30:18Z

Cleanup storvsc_drv.c after adding the contents of hyperv_storage.h.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
---
drivers/staging/hv/storvsc_drv.c | 30 +-----------------------------
1 files changed, 1 insertions(+), 29 deletions(-)

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 463b428..02f9c1e 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -22,6 +22,7 @@

#include <linux/kernel.h>
#include <linux/sched.h>
+#include <linux/wait.h>
#include <linux/completion.h>
#include <linux/string.h>
#include <linux/mm.h>
@@ -42,32 +43,6 @@
#include "hyperv.h"

-/*
- *
- * Copyright (c) 2011, 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>
- * K. Y. Srinivasan <kys@microsoft.com>
- *
- */
-
-
-
/* vstorage.w revision number. This is used in the case of a version match, */
/* to alert the user that structure sizes may be mismatched even though the */
/* protocol versions match. */
@@ -240,9 +215,6 @@ struct vstor_packet {
#define VSC_LEGAL_FLAGS (REQUEST_COMPLETION_FLAG)

-#include <linux/kernel.h>
-#include <linux/wait.h>
-#include "hyperv.h"

/* Defines */
#define STORVSC_RING_BUFFER_SIZE (20*PAGE_SIZE)
--
1.7.4.1