Staging: hv: storvsc: Move the storage driver out of the staging area

The storage driver (storvsc_drv.c) handles all block storage devices
assigned to Linux guests hosted on Hyper-V. This driver has been in the
staging tree for a while and this patch moves it out of the staging area.

James was willing to apply this patch during the 3.3-rc phase and a decision
was taken to defer this to 3.4 since Greg had queued up a bunch of storvsc
patches for 3.4. Now that Greg has applied all of the pending storvsc patches,
I am sending this patch to move this driver out of staging. Based on James'
recommendation, this patch gets rid of the unneeded files in the staging/hv
directory.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Acked-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 16570aa84aac0e1e420a541d7224ecfd0e567bbc..d3d18e89cb5761dbca06245ff92dd7978d5690f2 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -662,6 +662,13 @@ config VMWARE_PVSCSI
          To compile this driver as a module, choose M here: the
          module will be called vmw_pvscsi.
 
+config HYPERV_STORAGE
+       tristate "Microsoft Hyper-V virtual storage driver"
+       depends on SCSI && HYPERV
+       default HYPERV
+       help
+         Select this option to enable the Hyper-V virtual storage driver.
+
 config LIBFC
        tristate "LibFC module"
        select SCSI_FC_ATTRS

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 2b887498be50135bcd68a5e8b0a736f64482cd55..e4c1a69f8fab94abcf012a705d9c7471a21a1922 100644 (file)
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -142,6 +142,7 @@ obj-$(CONFIG_SCSI_BNX2_ISCSI)       += libiscsi.o bnx2i/
 obj-$(CONFIG_BE2ISCSI)         += libiscsi.o be2iscsi/
 obj-$(CONFIG_SCSI_PMCRAID)     += pmcraid.o
 obj-$(CONFIG_VMWARE_PVSCSI)    += vmw_pvscsi.o
+obj-$(CONFIG_HYPERV_STORAGE)   += hv_storvsc.o
 
 obj-$(CONFIG_ARM)              += arm/
 
@@ -170,6 +171,8 @@ scsi_mod-$(CONFIG_SCSI_PROC_FS)     += scsi_proc.o
 scsi_mod-y                     += scsi_trace.o
 scsi_mod-$(CONFIG_PM)          += scsi_pm.o
 
+hv_storvsc-y                   := storvsc_drv.o
+
 scsi_tgt-y                     += scsi_tgt_lib.o scsi_tgt_if.o
 
 sd_mod-objs    := sd.o

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
similarity index 100%
rename from drivers/staging/hv/storvsc_drv.c
rename to drivers/scsi/storvsc_drv.c

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index fae2e242025c60e0e42cae32452dd0460fd3fc1d..b5a311b9fe372e3d5ce78aaa39e6456f8b7471d1 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -76,8 +76,6 @@ source "drivers/staging/vt6655/Kconfig"
 
 source "drivers/staging/vt6656/Kconfig"
 
-source "drivers/staging/hv/Kconfig"
-
 source "drivers/staging/vme/Kconfig"
 
 source "drivers/staging/sep/Kconfig"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 84a6db25cc82f351ef335ed41e7e00a0296a8223..4908e4625e944bda180a7c9c5b00f8323320a2fd 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -29,7 +29,6 @@ obj-$(CONFIG_USB_SERIAL_QUATECH_USB2) += quatech_usb2/
 obj-$(CONFIG_OCTEON_ETHERNET)  += octeon/
 obj-$(CONFIG_VT6655)           += vt6655/
 obj-$(CONFIG_VT6656)           += vt6656/
-obj-$(CONFIG_HYPERV)           += hv/
 obj-$(CONFIG_VME_BUS)          += vme/
 obj-$(CONFIG_DX_SEP)            += sep/
 obj-$(CONFIG_IIO)              += iio/

diff --git a/drivers/staging/hv/Kconfig b/drivers/staging/hv/Kconfig
deleted file mode 100644 (file)
index 60ac479..0000000
--- a/drivers/staging/hv/Kconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-config HYPERV_STORAGE
-       tristate "Microsoft Hyper-V virtual storage driver"
-       depends on HYPERV && SCSI
-       help
-        Select this option to enable the Hyper-V virtual storage driver.

diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile
deleted file mode 100644 (file)
index af95a6b..0000000
--- a/drivers/staging/hv/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-$(CONFIG_HYPERV_STORAGE)   += hv_storvsc.o
-
-hv_storvsc-y := storvsc_drv.o

diff --git a/drivers/staging/hv/TODO b/drivers/staging/hv/TODO
deleted file mode 100644 (file)
index dea7d92..0000000
--- a/drivers/staging/hv/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-TODO:
-       - audit the scsi driver
-
-Please send patches for this code to Greg Kroah-Hartman <gregkh@suse.de>,
-Haiyang Zhang <haiyangz@microsoft.com>, and K. Y. Srinivasan <kys@microsoft.com>