RDMA/amso1100: Deprecate the amso1100 driver and move to staging

The HW hasn't been sold since 2005, and the SW has definite bit rot. Its time to remove it. So move it to staging for a few releases and then remove it after that. Signed-off-by: Steve Wise <swise@opengridcomputing.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
mariux64 · Aug 29, 2015 · 072bf1f · 072bf1f
1 parent 6f9b389
commit 072bf1f
Show file tree

Hide file tree

Showing 28 changed files with 7 additions and 2 deletions.
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
@@ -57,7 +57,6 @@ config INFINIBAND_ADDR_TRANS
 source "drivers/infiniband/hw/mthca/Kconfig"
 source "drivers/infiniband/hw/qib/Kconfig"
 source "drivers/infiniband/hw/ehca/Kconfig"
-source "drivers/infiniband/hw/amso1100/Kconfig"
 source "drivers/infiniband/hw/cxgb3/Kconfig"
 source "drivers/infiniband/hw/cxgb4/Kconfig"
 source "drivers/infiniband/hw/mlx4/Kconfig"

diff --git a/drivers/infiniband/hw/Makefile b/drivers/infiniband/hw/Makefile
@@ -1,7 +1,6 @@
 obj-$(CONFIG_INFINIBAND_MTHCA)		+= mthca/
 obj-$(CONFIG_INFINIBAND_QIB)		+= qib/
 obj-$(CONFIG_INFINIBAND_EHCA)		+= ehca/
-obj-$(CONFIG_INFINIBAND_AMSO1100)	+= amso1100/
 obj-$(CONFIG_INFINIBAND_CXGB3)		+= cxgb3/
 obj-$(CONFIG_INFINIBAND_CXGB4)		+= cxgb4/
 obj-$(CONFIG_MLX4_INFINIBAND)		+= mlx4/

diff --git a/drivers/staging/rdma/Kconfig b/drivers/staging/rdma/Kconfig
@@ -22,6 +22,8 @@ menuconfig STAGING_RDMA
 # Please keep entries in alphabetic order
 if STAGING_RDMA
 
+source "drivers/staging/rdma/amso1100/Kconfig"
+
 source "drivers/staging/rdma/ipath/Kconfig"
 
 endif
diff --git a/drivers/staging/rdma/Makefile b/drivers/staging/rdma/Makefile
@@ -1,2 +1,3 @@
 # Entries for RDMA_STAGING tree
+obj-$(CONFIG_INFINIBAND_AMSO1100)	+= amso1100/
 obj-$(CONFIG_INFINIBAND_IPATH)	+= ipath/
diff --git a/drivers/infiniband/hw/amso1100/Kbuild → drivers/staging/rdma/amso1100/Kbuild b/drivers/infiniband/hw/amso1100/Kbuild → drivers/staging/rdma/amso1100/Kbuild
diff --git a/drivers/infiniband/hw/amso1100/Kconfig → drivers/staging/rdma/amso1100/Kconfig b/drivers/infiniband/hw/amso1100/Kconfig → drivers/staging/rdma/amso1100/Kconfig
diff --git a/drivers/staging/rdma/amso1100/TODO b/drivers/staging/rdma/amso1100/TODO
@@ -0,0 +1,4 @@
+7/2015
+
+The amso1100 driver has been deprecated and moved to drivers/staging.
+It will be removed in the 4.6 merge window.
diff --git a/drivers/infiniband/hw/amso1100/c2.c → drivers/staging/rdma/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c → drivers/staging/rdma/amso1100/c2.c
diff --git a/drivers/infiniband/hw/amso1100/c2.h → drivers/staging/rdma/amso1100/c2.h b/drivers/infiniband/hw/amso1100/c2.h → drivers/staging/rdma/amso1100/c2.h
diff --git a/drivers/infiniband/hw/amso1100/c2_ae.c → drivers/staging/rdma/amso1100/c2_ae.c b/drivers/infiniband/hw/amso1100/c2_ae.c → drivers/staging/rdma/amso1100/c2_ae.c
diff --git a/drivers/infiniband/hw/amso1100/c2_ae.h → drivers/staging/rdma/amso1100/c2_ae.h b/drivers/infiniband/hw/amso1100/c2_ae.h → drivers/staging/rdma/amso1100/c2_ae.h
diff --git a/drivers/infiniband/hw/amso1100/c2_alloc.c → drivers/staging/rdma/amso1100/c2_alloc.c b/drivers/infiniband/hw/amso1100/c2_alloc.c → drivers/staging/rdma/amso1100/c2_alloc.c
diff --git a/drivers/infiniband/hw/amso1100/c2_cm.c → drivers/staging/rdma/amso1100/c2_cm.c b/drivers/infiniband/hw/amso1100/c2_cm.c → drivers/staging/rdma/amso1100/c2_cm.c
diff --git a/drivers/infiniband/hw/amso1100/c2_cq.c → drivers/staging/rdma/amso1100/c2_cq.c b/drivers/infiniband/hw/amso1100/c2_cq.c → drivers/staging/rdma/amso1100/c2_cq.c
diff --git a/drivers/infiniband/hw/amso1100/c2_intr.c → drivers/staging/rdma/amso1100/c2_intr.c b/drivers/infiniband/hw/amso1100/c2_intr.c → drivers/staging/rdma/amso1100/c2_intr.c
diff --git a/drivers/infiniband/hw/amso1100/c2_mm.c → drivers/staging/rdma/amso1100/c2_mm.c b/drivers/infiniband/hw/amso1100/c2_mm.c → drivers/staging/rdma/amso1100/c2_mm.c
diff --git a/drivers/infiniband/hw/amso1100/c2_mq.c → drivers/staging/rdma/amso1100/c2_mq.c b/drivers/infiniband/hw/amso1100/c2_mq.c → drivers/staging/rdma/amso1100/c2_mq.c
diff --git a/drivers/infiniband/hw/amso1100/c2_mq.h → drivers/staging/rdma/amso1100/c2_mq.h b/drivers/infiniband/hw/amso1100/c2_mq.h → drivers/staging/rdma/amso1100/c2_mq.h
diff --git a/drivers/infiniband/hw/amso1100/c2_pd.c → drivers/staging/rdma/amso1100/c2_pd.c b/drivers/infiniband/hw/amso1100/c2_pd.c → drivers/staging/rdma/amso1100/c2_pd.c
diff --git a/drivers/infiniband/hw/amso1100/c2_provider.c → drivers/staging/rdma/amso1100/c2_provider.c b/drivers/infiniband/hw/amso1100/c2_provider.c → drivers/staging/rdma/amso1100/c2_provider.c
diff --git a/drivers/infiniband/hw/amso1100/c2_provider.h → drivers/staging/rdma/amso1100/c2_provider.h b/drivers/infiniband/hw/amso1100/c2_provider.h → drivers/staging/rdma/amso1100/c2_provider.h
diff --git a/drivers/infiniband/hw/amso1100/c2_qp.c → drivers/staging/rdma/amso1100/c2_qp.c b/drivers/infiniband/hw/amso1100/c2_qp.c → drivers/staging/rdma/amso1100/c2_qp.c
diff --git a/drivers/infiniband/hw/amso1100/c2_rnic.c → drivers/staging/rdma/amso1100/c2_rnic.c b/drivers/infiniband/hw/amso1100/c2_rnic.c → drivers/staging/rdma/amso1100/c2_rnic.c
diff --git a/drivers/infiniband/hw/amso1100/c2_status.h → drivers/staging/rdma/amso1100/c2_status.h b/drivers/infiniband/hw/amso1100/c2_status.h → drivers/staging/rdma/amso1100/c2_status.h
diff --git a/drivers/infiniband/hw/amso1100/c2_user.h → drivers/staging/rdma/amso1100/c2_user.h b/drivers/infiniband/hw/amso1100/c2_user.h → drivers/staging/rdma/amso1100/c2_user.h
diff --git a/drivers/infiniband/hw/amso1100/c2_vq.c → drivers/staging/rdma/amso1100/c2_vq.c b/drivers/infiniband/hw/amso1100/c2_vq.c → drivers/staging/rdma/amso1100/c2_vq.c
diff --git a/drivers/infiniband/hw/amso1100/c2_vq.h → drivers/staging/rdma/amso1100/c2_vq.h b/drivers/infiniband/hw/amso1100/c2_vq.h → drivers/staging/rdma/amso1100/c2_vq.h
diff --git a/drivers/infiniband/hw/amso1100/c2_wr.h → drivers/staging/rdma/amso1100/c2_wr.h b/drivers/infiniband/hw/amso1100/c2_wr.h → drivers/staging/rdma/amso1100/c2_wr.h