From 2cbf7fe2d5d32a4747c1f8ad163e886dccad930c Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 3 Feb 2015 13:18:55 +0000 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/Kconfig | 2 -- drivers/message/Makefile | 1 - drivers/staging/Kconfig | 2 ++ drivers/staging/Makefile | 1 + drivers/{message => staging}/i2o/Kconfig | 1 - drivers/{message => staging}/i2o/Makefile | 0 drivers/{message => staging}/i2o/README | 0 drivers/{message => staging}/i2o/README.ioctl | 0 drivers/{message => staging}/i2o/bus-osm.c | 2 +- drivers/{message => staging}/i2o/config-osm.c | 2 +- drivers/{message => staging}/i2o/core.h | 0 drivers/{message => staging}/i2o/debug.c | 2 +- drivers/{message => staging}/i2o/device.c | 2 +- drivers/{message => staging}/i2o/driver.c | 2 +- drivers/{message => staging}/i2o/exec-osm.c | 2 +- {include/linux => drivers/staging/i2o}/i2o.h | 0 drivers/{message => staging}/i2o/i2o_block.c | 2 +- drivers/{message => staging}/i2o/i2o_block.h | 0 drivers/{message => staging}/i2o/i2o_config.c | 0 drivers/{message => staging}/i2o/i2o_proc.c | 2 +- drivers/{message => staging}/i2o/i2o_scsi.c | 2 +- drivers/{message => staging}/i2o/iop.c | 2 +- drivers/{message => staging}/i2o/memory.c | 2 +- drivers/{message => staging}/i2o/pci.c | 2 +- 24 files changed, 15 insertions(+), 16 deletions(-) rename drivers/{message => staging}/i2o/Kconfig (99%) rename drivers/{message => staging}/i2o/Makefile (100%) rename drivers/{message => staging}/i2o/README (100%) rename drivers/{message => staging}/i2o/README.ioctl (100%) rename drivers/{message => staging}/i2o/bus-osm.c (99%) rename drivers/{message => staging}/i2o/config-osm.c (98%) rename drivers/{message => staging}/i2o/core.h (100%) rename drivers/{message => staging}/i2o/debug.c (99%) rename drivers/{message => staging}/i2o/device.c (99%) rename drivers/{message => staging}/i2o/driver.c (99%) rename drivers/{message => staging}/i2o/exec-osm.c (99%) rename {include/linux => drivers/staging/i2o}/i2o.h (100%) rename drivers/{message => staging}/i2o/i2o_block.c (99%) rename drivers/{message => staging}/i2o/i2o_block.h (100%) rename drivers/{message => staging}/i2o/i2o_config.c (100%) rename drivers/{message => staging}/i2o/i2o_proc.c (99%) rename drivers/{message => staging}/i2o/i2o_scsi.c (99%) rename drivers/{message => staging}/i2o/iop.c (99%) rename drivers/{message => staging}/i2o/memory.c (99%) rename drivers/{message => staging}/i2o/pci.c (99%) diff --git a/drivers/Kconfig b/drivers/Kconfig index c70d6e45dc10..c0cc96bab9e7 100644 --- 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 97ef5a01ad11..755676ded67c 100644 --- 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 071ac116818f..9e52bcd5356d 100644 --- 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 b65ca376d957..6e0ac524c84d 100644 --- 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 5afa0e393ecf..286c53f4b13d 100644 --- 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 c463dc2efc09..7aa0339aea05 100644 --- a/drivers/message/i2o/bus-osm.c +++ b/drivers/staging/i2o/bus-osm.c @@ -14,7 +14,7 @@ */ #include -#include +#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 3bba7aa82e58..519f52f9f688 100644 --- a/drivers/message/i2o/config-osm.c +++ b/drivers/staging/i2o/config-osm.c @@ -14,7 +14,7 @@ */ #include -#include +#include "i2o.h" #include #include #include 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 ce62d8bfe1c8..7a16114ed8ea 100644 --- a/drivers/message/i2o/debug.c +++ b/drivers/staging/i2o/debug.c @@ -1,7 +1,7 @@ #include #include #include -#include +#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 98348f420b52..2af22553dd4e 100644 --- a/drivers/message/i2o/device.c +++ b/drivers/staging/i2o/device.c @@ -14,7 +14,7 @@ */ #include -#include +#include "i2o.h" #include #include #include 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 1b18a0d1d05b..111c3edde035 100644 --- a/drivers/message/i2o/driver.c +++ b/drivers/staging/i2o/driver.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include "i2o.h" #include #include #include 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 a3970e56ae53..16d857d5e655 100644 --- a/drivers/message/i2o/exec-osm.c +++ b/drivers/staging/i2o/exec-osm.c @@ -28,7 +28,7 @@ */ #include -#include +#include "i2o.h" #include #include #include 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 6fc3866965df..0a13c64ce000 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/staging/i2o/i2o_block.c @@ -52,7 +52,7 @@ #include #include -#include +#include "i2o.h" #include #include 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 b7d87cd227a9..ad84f3304f3c 100644 --- a/drivers/message/i2o/i2o_proc.c +++ b/drivers/staging/i2o/i2o_proc.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include "i2o.h" #include #include #include 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 8152e9fa9d95..1b11dcb3faea 100644 --- a/drivers/message/i2o/i2o_scsi.c +++ b/drivers/staging/i2o/i2o_scsi.c @@ -53,7 +53,7 @@ #include #include #include -#include +#include "i2o.h" #include #include 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 92752fb5b2d3..52334fc8b547 100644 --- a/drivers/message/i2o/iop.c +++ b/drivers/staging/i2o/iop.c @@ -26,7 +26,7 @@ */ #include -#include +#include "i2o.h" #include #include #include 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 292b41e49fbd..8f9509d275a4 100644 --- a/drivers/message/i2o/memory.c +++ b/drivers/staging/i2o/memory.c @@ -11,7 +11,7 @@ */ #include -#include +#include "i2o.h" #include #include #include 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 0f9f3e1a2b6b..b3b8a61dd4a6 100644 --- a/drivers/message/i2o/pci.c +++ b/drivers/staging/i2o/pci.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include "i2o.h" #include #include "core.h" -- 2.20.1