i2o: move to staging

The I2O layer deals with a technology that to say the least didn't catch on
in the market.

The only relevant products are some of the AMI MegaRAID - which supported I2O
and its native mode (The native mode is faster and runs on Linux), an
obscure crypto ethernet card that's now so many years out of date nobody
would use it, the old DPT controllers, which speak their own dialect and
have their own driver - and ermm.. thats about it.

We also know the code isn't in good shape as recently a patch was proposed
and queried as buggy, which in turn showed the existing code was broken
already by prior "clean up" and nobody had noticed that either.

It's coding style robot code nothing more. Like some forgotten corridor
cleaned relentlessly by a lost Roomba but where no user has trodden in years.

Move it to staging and then to /dev/null.

The headers remain as they are shared with dpt_i2o.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/Kconfig b/drivers/Kconfig
index c70d6e45dc1029a8be0422bd21ca979b97e0365e..c0cc96bab9e74131e650e0a45a89a719444681d9 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -36,8 +36,6 @@ source "drivers/message/fusion/Kconfig"
 
 source "drivers/firewire/Kconfig"
 
-source "drivers/message/i2o/Kconfig"
-
 source "drivers/macintosh/Kconfig"
 
 source "drivers/net/Kconfig"

diff --git a/drivers/message/Makefile b/drivers/message/Makefile
index 97ef5a01ad1159b9f90ab7c7bb48e902ec424972..755676ded67c7ffe63c64f7684757bc0c12ba90c 100644 (file)
--- a/drivers/message/Makefile
+++ b/drivers/message/Makefile
@@ -2,5 +2,4 @@
 # Makefile for MPT based block devices
 #
 
-obj-$(CONFIG_I2O)      += i2o/
 obj-$(CONFIG_FUSION)   += fusion/

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 071ac116818f54a5f04c681ce49a08098e04ea8c..9e52bcd5356da0075afbc4de4949c21802a6cee5 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -110,4 +110,6 @@ source "drivers/staging/clocking-wizard/Kconfig"
 
 source "drivers/staging/fbtft/Kconfig"
 
+source "drivers/staging/i2o/Kconfig"
+
 endif # STAGING

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index b65ca376d9575c75311e605b8e1ac5ccb21a3cce..6e0ac524c84d9474b0cf8197a35e0f98d2f3d5bd 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -47,3 +47,4 @@ obj-$(CONFIG_CRYPTO_SKEIN)    += skein/
 obj-$(CONFIG_UNISYSSPAR)       += unisys/
 obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD)  += clocking-wizard/
 obj-$(CONFIG_FB_TFT)           += fbtft/
+obj-$(CONFIG_I2O)              += i2o/

diff --git a/drivers/message/i2o/Kconfig b/drivers/staging/i2o/Kconfig
similarity index 99%
rename from drivers/message/i2o/Kconfig
rename to drivers/staging/i2o/Kconfig
index 5afa0e393ecff9aac86d3806951a0e5127a0d0e8..286c53f4b13d8c5d15faab61ed802356570c8029 100644 (file)
--- a/drivers/message/i2o/Kconfig
+++ b/drivers/staging/i2o/Kconfig
@@ -1,4 +1,3 @@
-
 menuconfig I2O
        tristate "I2O device support"
        depends on PCI

diff --git a/drivers/message/i2o/Makefile b/drivers/staging/i2o/Makefile
similarity index 100%
rename from drivers/message/i2o/Makefile
rename to drivers/staging/i2o/Makefile

diff --git a/drivers/message/i2o/README b/drivers/staging/i2o/README
similarity index 100%
rename from drivers/message/i2o/README
rename to drivers/staging/i2o/README

diff --git a/drivers/message/i2o/README.ioctl b/drivers/staging/i2o/README.ioctl
similarity index 100%
rename from drivers/message/i2o/README.ioctl
rename to drivers/staging/i2o/README.ioctl

diff --git a/drivers/message/i2o/bus-osm.c b/drivers/staging/i2o/bus-osm.c
similarity index 99%
rename from drivers/message/i2o/bus-osm.c
rename to drivers/staging/i2o/bus-osm.c
index c463dc2efc09490b26bdc6e2d0e46fdd694dce74..7aa0339aea056f3ec723f4ef3baa63b80da21f4e 100644 (file)
--- a/drivers/message/i2o/bus-osm.c
+++ b/drivers/staging/i2o/bus-osm.c
@@ -14,7 +14,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/i2o.h>
+#include "i2o.h"
 
 #define OSM_NAME       "bus-osm"
 #define OSM_VERSION    "1.317"

diff --git a/drivers/message/i2o/config-osm.c b/drivers/staging/i2o/config-osm.c
similarity index 98%
rename from drivers/message/i2o/config-osm.c
rename to drivers/staging/i2o/config-osm.c
index 3bba7aa82e58bd5d5a1f0c30c30cd62a32de5d0b..519f52f9f68819ade9816ec6e89610fbe2adb826 100644 (file)
--- a/drivers/message/i2o/config-osm.c
+++ b/drivers/staging/i2o/config-osm.c
@@ -14,7 +14,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/i2o.h>
+#include "i2o.h"
 #include <linux/dcache.h>
 #include <linux/namei.h>
 #include <linux/fs.h>

diff --git a/drivers/message/i2o/core.h b/drivers/staging/i2o/core.h
similarity index 100%
rename from drivers/message/i2o/core.h
rename to drivers/staging/i2o/core.h

diff --git a/drivers/message/i2o/debug.c b/drivers/staging/i2o/debug.c
similarity index 99%
rename from drivers/message/i2o/debug.c
rename to drivers/staging/i2o/debug.c
index ce62d8bfe1c832568b33418624f1acc5e16359ac..7a16114ed8ea39cf70c9dd8e241e5b8e8babf824 100644 (file)
--- a/drivers/message/i2o/debug.c
+++ b/drivers/staging/i2o/debug.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
-#include <linux/i2o.h>
+#include "i2o.h"
 
 static void i2o_report_util_cmd(u8 cmd);
 static void i2o_report_exec_cmd(u8 cmd);

diff --git a/drivers/message/i2o/device.c b/drivers/staging/i2o/device.c
similarity index 99%
rename from drivers/message/i2o/device.c
rename to drivers/staging/i2o/device.c
index 98348f420b52b9aae3dee2c274122739fc5ef931..2af22553dd4e8fdbf7c4bde3bcceabb5ed23e44c 100644 (file)
--- a/drivers/message/i2o/device.c
+++ b/drivers/staging/i2o/device.c
@@ -14,7 +14,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/i2o.h>
+#include "i2o.h"
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/slab.h>

diff --git a/drivers/message/i2o/driver.c b/drivers/staging/i2o/driver.c
similarity index 99%
rename from drivers/message/i2o/driver.c
rename to drivers/staging/i2o/driver.c
index 1b18a0d1d05bdfd3a7ce364b221ee0a2ae59f5cd..111c3edde035d5bee7ca8e5b659a126c06e87ff0 100644 (file)
--- a/drivers/message/i2o/driver.c
+++ b/drivers/staging/i2o/driver.c
@@ -16,7 +16,7 @@
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/rwsem.h>
-#include <linux/i2o.h>
+#include "i2o.h"
 #include <linux/workqueue.h>
 #include <linux/string.h>
 #include <linux/slab.h>

diff --git a/drivers/message/i2o/exec-osm.c b/drivers/staging/i2o/exec-osm.c
similarity index 99%
rename from drivers/message/i2o/exec-osm.c
rename to drivers/staging/i2o/exec-osm.c
index a3970e56ae539f693cf9c92217976058e5696661..16d857d5e65541738c1fecb9db03d5cd04084f67 100644 (file)
--- a/drivers/message/i2o/exec-osm.c
+++ b/drivers/staging/i2o/exec-osm.c
@@ -28,7 +28,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/i2o.h>
+#include "i2o.h"
 #include <linux/delay.h>
 #include <linux/workqueue.h>
 #include <linux/string.h>

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

diff --git a/drivers/message/i2o/i2o_block.c b/drivers/staging/i2o/i2o_block.c
similarity index 99%
rename from drivers/message/i2o/i2o_block.c
rename to drivers/staging/i2o/i2o_block.c
index 6fc3866965df9713d80c1c0bbc917a2c5fd603a7..0a13c64ce000b9884132eae097af5c343aa4d9d0 100644 (file)
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/staging/i2o/i2o_block.c
@@ -52,7 +52,7 @@
 
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/i2o.h>
+#include "i2o.h"
 #include <linux/mutex.h>
 
 #include <linux/mempool.h>

diff --git a/drivers/message/i2o/i2o_block.h b/drivers/staging/i2o/i2o_block.h
similarity index 100%
rename from drivers/message/i2o/i2o_block.h
rename to drivers/staging/i2o/i2o_block.h

diff --git a/drivers/message/i2o/i2o_config.c b/drivers/staging/i2o/i2o_config.c
similarity index 100%
rename from drivers/message/i2o/i2o_config.c
rename to drivers/staging/i2o/i2o_config.c

diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/staging/i2o/i2o_proc.c
similarity index 99%
rename from drivers/message/i2o/i2o_proc.c
rename to drivers/staging/i2o/i2o_proc.c
index b7d87cd227a902b4de1c405dcf726419217b1adc..ad84f3304f3cd3ea2b1863e87e360d06f8a77ced 100644 (file)
--- a/drivers/message/i2o/i2o_proc.c
+++ b/drivers/staging/i2o/i2o_proc.c
@@ -39,7 +39,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
-#include <linux/i2o.h>
+#include "i2o.h"
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>

diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/staging/i2o/i2o_scsi.c
similarity index 99%
rename from drivers/message/i2o/i2o_scsi.c
rename to drivers/staging/i2o/i2o_scsi.c
index 8152e9fa9d95c2a4334d6efe7d94469cd8d07033..1b11dcb3faea7bedbc82cb70435048ca4041d00f 100644 (file)
--- a/drivers/message/i2o/i2o_scsi.c
+++ b/drivers/staging/i2o/i2o_scsi.c
@@ -53,7 +53,7 @@
 #include <linux/prefetch.h>
 #include <linux/pci.h>
 #include <linux/blkdev.h>
-#include <linux/i2o.h>
+#include "i2o.h"
 #include <linux/scatterlist.h>
 
 #include <asm/dma.h>

diff --git a/drivers/message/i2o/iop.c b/drivers/staging/i2o/iop.c
similarity index 99%
rename from drivers/message/i2o/iop.c
rename to drivers/staging/i2o/iop.c
index 92752fb5b2d3d8b41364261a99eb44938e33be32..52334fc8b547002857c015380b50f1ecd612fc7d 100644 (file)
--- a/drivers/message/i2o/iop.c
+++ b/drivers/staging/i2o/iop.c
@@ -26,7 +26,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/i2o.h>
+#include "i2o.h"
 #include <linux/delay.h>
 #include <linux/sched.h>
 #include <linux/slab.h>

diff --git a/drivers/message/i2o/memory.c b/drivers/staging/i2o/memory.c
similarity index 99%
rename from drivers/message/i2o/memory.c
rename to drivers/staging/i2o/memory.c
index 292b41e49fbd57c5881c03cf7daa889a72404948..8f9509d275a46f4b66d399d932d5a472a9639741 100644 (file)
--- a/drivers/message/i2o/memory.c
+++ b/drivers/staging/i2o/memory.c
@@ -11,7 +11,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/i2o.h>
+#include "i2o.h"
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/slab.h>

diff --git a/drivers/message/i2o/pci.c b/drivers/staging/i2o/pci.c
similarity index 99%
rename from drivers/message/i2o/pci.c
rename to drivers/staging/i2o/pci.c
index 0f9f3e1a2b6b4f75db8c3413dc83a549dc1c8cb4..b3b8a61dd4a6d7e25d2def976995b8dddf298205 100644 (file)
--- a/drivers/message/i2o/pci.c
+++ b/drivers/staging/i2o/pci.c
@@ -30,7 +30,7 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
-#include <linux/i2o.h>
+#include "i2o.h"
 #include <linux/module.h>
 #include "core.h"