drivers: visorbus: move driver out of staging

Move the visorbus driver out of staging (drivers/staging/unisys/visorbus)
and to drivers/visorbus. Modify the configuration and makefiles so they
now reference the new location. The s-Par header file visorbus.h that is
referenced by all s-Par drivers, is being moved into include/linux.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 6308fa7aa91def31dd9c630b1cb3337a9dc632ad..36f76be322a3387aa75bb488dbe814d9a892083d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14006,6 +14006,8 @@ UNISYS S-PAR DRIVERS
 M:     David Kershner <david.kershner@unisys.com>
 L:     sparmaintainer@unisys.com (Unisys internal)
 S:     Supported
+F:     include/linux/visorbus.h
+F:     drivers/visorbus/
 F:     drivers/staging/unisys/
 
 UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 152744c5ef0f394afe1c32971053fd796b9fc6aa..ef5fb8395d76d0c726f2f2ce8c03bde0d9ccb694 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -211,4 +211,6 @@ source "drivers/mux/Kconfig"
 
 source "drivers/opp/Kconfig"
 
+source "drivers/visorbus/Kconfig"
+
 endmenu

diff --git a/drivers/Makefile b/drivers/Makefile
index e06f7f633f73ff285c64e19b89041d17e2be23ce..7a2330077e4721ae485a4f5e94ac91438d938b83 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -184,3 +184,4 @@ obj-$(CONFIG_FPGA)          += fpga/
 obj-$(CONFIG_FSI)              += fsi/
 obj-$(CONFIG_TEE)              += tee/
 obj-$(CONFIG_MULTIPLEXER)      += mux/
+obj-$(CONFIG_UNISYS_VISORBUS)  += visorbus/

diff --git a/drivers/staging/unisys/Kconfig b/drivers/staging/unisys/Kconfig
index 4d190389aa6cf5700037e363e03f503ff9dedc9f..c27dab3b610f1feddf3d15c0a41dd3bfbe5d3fce 100644 (file)
--- a/drivers/staging/unisys/Kconfig
+++ b/drivers/staging/unisys/Kconfig
@@ -8,7 +8,6 @@ menuconfig UNISYSSPAR
 
 if UNISYSSPAR
 
-source "drivers/staging/unisys/visorbus/Kconfig"
 source "drivers/staging/unisys/visornic/Kconfig"
 source "drivers/staging/unisys/visorinput/Kconfig"
 source "drivers/staging/unisys/visorhba/Kconfig"

diff --git a/drivers/staging/unisys/Makefile b/drivers/staging/unisys/Makefile
index 20eb098538d3fa9c3498c7e4df70232c994cf679..e45f44b6420247407f760eaaa16c64ada852c7bf 100644 (file)
--- a/drivers/staging/unisys/Makefile
+++ b/drivers/staging/unisys/Makefile
@@ -1,7 +1,6 @@
 #
 # Makefile for Unisys SPAR drivers
 #
-obj-$(CONFIG_UNISYS_VISORBUS)          += visorbus/
 obj-$(CONFIG_UNISYS_VISORNIC)          += visornic/
 obj-$(CONFIG_UNISYS_VISORINPUT)                += visorinput/
 obj-$(CONFIG_UNISYS_VISORHBA)          += visorhba/

diff --git a/drivers/staging/unisys/include/iochannel.h b/drivers/staging/unisys/include/iochannel.h
index 9023cf56625d53cd3aa65ac64e3bdbb0c5dea915..45c785d80ce4706b592b941678fd26d96ae5ea17 100644 (file)
--- a/drivers/staging/unisys/include/iochannel.h
+++ b/drivers/staging/unisys/include/iochannel.h
@@ -33,8 +33,7 @@
 
 #include <linux/uuid.h>
 #include <linux/skbuff.h>
-
-#include "visorbus.h"
+#include <linux/visorbus.h>
 
 /*
  * Must increment these whenever you insert or delete fields within this channel

diff --git a/drivers/staging/unisys/visorhba/visorhba_main.c b/drivers/staging/unisys/visorhba/visorhba_main.c
index da650d64695a65d9709cc77b5e98b6c343e16d78..167e98f8688e01008fe9be1f913a5de41a61ed0c 100644 (file)
--- a/drivers/staging/unisys/visorhba/visorhba_main.c
+++ b/drivers/staging/unisys/visorhba/visorhba_main.c
@@ -9,12 +9,12 @@
 #include <linux/idr.h>
 #include <linux/module.h>
 #include <linux/seq_file.h>
+#include <linux/visorbus.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 
-#include "visorbus.h"
 #include "iochannel.h"
 
 /* The Send and Receive Buffers of the IO Queue may both be full */

diff --git a/drivers/staging/unisys/visorinput/visorinput.c b/drivers/staging/unisys/visorinput/visorinput.c
index dabc5b44208e0553d4a004b4493b8a70b3bc32ca..d8048e48658ffb5f9872e4f8107104f282482509 100644 (file)
--- a/drivers/staging/unisys/visorinput/visorinput.c
+++ b/drivers/staging/unisys/visorinput/visorinput.c
@@ -16,8 +16,8 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/uuid.h>
+#include <linux/visorbus.h>
 
-#include "visorbus.h"
 #include "ultrainputreport.h"
 
 /* Keyboard channel {c73416d0-b0b8-44af-b304-9d2ae99f1b3d} */

diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c
index 112a76ec06280b151bfcf81d8641bd7de901d568..92dceb557886b8f4971d33790d6cc3b8c960face 100644 (file)
--- a/drivers/staging/unisys/visornic/visornic_main.c
+++ b/drivers/staging/unisys/visornic/visornic_main.c
@@ -16,8 +16,8 @@
 #include <linux/kthread.h>
 #include <linux/skbuff.h>
 #include <linux/rtnetlink.h>
+#include <linux/visorbus.h>
 
-#include "visorbus.h"
 #include "iochannel.h"
 
 #define VISORNIC_INFINITE_RSP_WAIT 0

diff --git a/drivers/staging/unisys/visorbus/Kconfig b/drivers/visorbus/Kconfig
similarity index 95%
rename from drivers/staging/unisys/visorbus/Kconfig
rename to drivers/visorbus/Kconfig
index 3866804ed91861528b94c2e1a0cd8ae12b2a0a51..1f5812b936d0dd015240724ab10b24f6b7e80ef4 100644 (file)
--- a/drivers/staging/unisys/visorbus/Kconfig
+++ b/drivers/visorbus/Kconfig
@@ -4,7 +4,6 @@
 
 config UNISYS_VISORBUS
        tristate "Unisys visorbus driver"
-       depends on UNISYSSPAR
        depends on X86_64 && ACPI
        ---help---
        The visorbus driver is a virtualized bus for the Unisys s-Par firmware.

diff --git a/drivers/staging/unisys/visorbus/Makefile b/drivers/visorbus/Makefile
similarity index 81%
rename from drivers/staging/unisys/visorbus/Makefile
rename to drivers/visorbus/Makefile
index 784cdc1f9d6a1acaa9a9b5e9e4ee76b8c0536cf9..e8df59d1301f187ce7e7760c835527d5c52888fa 100644 (file)
--- a/drivers/staging/unisys/visorbus/Makefile
+++ b/drivers/visorbus/Makefile
@@ -8,5 +8,3 @@ obj-$(CONFIG_UNISYS_VISORBUS)   += visorbus.o
 visorbus-y := visorbus_main.o
 visorbus-y += visorchannel.o
 visorbus-y += visorchipset.o
-
-ccflags-y += -Idrivers/staging/unisys/include

diff --git a/drivers/staging/unisys/visorbus/controlvmchannel.h b/drivers/visorbus/controlvmchannel.h
similarity index 99%
rename from drivers/staging/unisys/visorbus/controlvmchannel.h
rename to drivers/visorbus/controlvmchannel.h
index b0ae29e505ff87c87e1a816c325066273f03ca97..8c57562a070a91da1d3cfbe4c48f16b4377838b4 100644 (file)
--- a/drivers/staging/unisys/visorbus/controlvmchannel.h
+++ b/drivers/visorbus/controlvmchannel.h
@@ -8,8 +8,7 @@
 #define __CONTROLVMCHANNEL_H__
 
 #include <linux/uuid.h>
-
-#include "visorbus.h"
+#include <linux/visorbus.h>
 
 /* {2B3C2D10-7EF5-4ad8-B966-3448B7386B3D} */
 #define VISOR_CONTROLVM_CHANNEL_GUID \

diff --git a/drivers/staging/unisys/visorbus/vbuschannel.h b/drivers/visorbus/vbuschannel.h
similarity index 99%
rename from drivers/staging/unisys/visorbus/vbuschannel.h
rename to drivers/visorbus/vbuschannel.h
index 622c9d71a04a58d8f7fd2fb96bed1aafdcd7fde9..b1dce26166bf1cc80526382e60253ff34047abf9 100644 (file)
--- a/drivers/staging/unisys/visorbus/vbuschannel.h
+++ b/drivers/visorbus/vbuschannel.h
@@ -17,7 +17,7 @@
  */
 
 #include <linux/uuid.h>
-#include "visorbus.h"
+#include <linux/visorbus.h>
 
 /* {193b331b-c58f-11da-95a9-00e08161165f} */
 #define VISOR_VBUS_CHANNEL_GUID                                                \

diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/visorbus/visorbus_main.c
similarity index 99%
rename from drivers/staging/unisys/visorbus/visorbus_main.c
rename to drivers/visorbus/visorbus_main.c
index a16715525dc9d1beeb60f5bfd1bccc993ae1d76b..0b2434cc4ecd4dbd6dde5feccea26fbb42ee5a1b 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/visorbus/visorbus_main.c
@@ -8,9 +8,9 @@
 #include <linux/debugfs.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/visorbus.h>
 #include <linux/uuid.h>
 
-#include "visorbus.h"
 #include "visorbus_private.h"
 
 static const guid_t visor_vbus_channel_guid = VISOR_VBUS_CHANNEL_GUID;

diff --git a/drivers/staging/unisys/visorbus/visorbus_private.h b/drivers/visorbus/visorbus_private.h
similarity index 98%
rename from drivers/staging/unisys/visorbus/visorbus_private.h
rename to drivers/visorbus/visorbus_private.h
index e48498fedc490856cf232898a3aed7dc02b0f864..366380b7f8d9eeb7525ecff78e6b7006bf4d70e2 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorbus_private.h
+++ b/drivers/visorbus/visorbus_private.h
@@ -9,10 +9,10 @@
 
 #include <linux/uuid.h>
 #include <linux/utsname.h>
+#include <linux/visorbus.h>
 
 #include "controlvmchannel.h"
 #include "vbuschannel.h"
-#include "visorbus.h"
 
 struct visor_device *visorbus_get_device_by_id(u32 bus_no, u32 dev_no,
                                               struct visor_device *from);

diff --git a/drivers/staging/unisys/visorbus/visorchannel.c b/drivers/visorbus/visorchannel.c
similarity index 99%
rename from drivers/staging/unisys/visorbus/visorchannel.c
rename to drivers/visorbus/visorchannel.c
index f3996a750c3b19752826df6b3eca6e0c5f64df8e..bd890e0f456b9de3b3ed4d016cbe00fcbf6fd5e2 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorchannel.c
+++ b/drivers/visorbus/visorchannel.c
@@ -12,8 +12,8 @@
 #include <linux/uuid.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/visorbus.h>
 
-#include "visorbus.h"
 #include "visorbus_private.h"
 #include "controlvmchannel.h"
 

diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/visorbus/visorchipset.c
similarity index 99%
rename from drivers/staging/unisys/visorbus/visorchipset.c
rename to drivers/visorbus/visorchipset.c
index daff44d7a8c046aa22c4769576eb39580f2e309e..ca752b8f495fa509fd8bd55bfbe9eecf68054f57 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorchipset.c
+++ b/drivers/visorbus/visorchipset.c
@@ -6,8 +6,8 @@
 
 #include <linux/acpi.h>
 #include <linux/crash_dump.h>
+#include <linux/visorbus.h>
 
-#include "visorbus.h"
 #include "visorbus_private.h"
 
 /* {72120008-4AAB-11DC-8530-444553544200} */

diff --git a/drivers/staging/unisys/include/visorbus.h b/include/linux/visorbus.h
similarity index 100%
rename from drivers/staging/unisys/include/visorbus.h
rename to include/linux/visorbus.h