From 1ca163afb6fd569b6efdc221954177cba5a02cbc Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 27 Aug 2017 17:03:31 +0200 Subject: [PATCH 1/4] irda: move net/irda/ to drivers/staging/irda/net/ It's time to get rid of IRDA. It's long been broken, and no one seems to use it anymore. So move it to staging and after a while, we can delete it from there. To start, move the network irda core from net/irda to drivers/staging/irda/net/ Signed-off-by: Greg Kroah-Hartman Signed-off-by: David S. Miller --- drivers/staging/Kconfig | 2 ++ drivers/staging/Makefile | 1 + {net/irda => drivers/staging/irda/net}/Kconfig | 6 +++--- {net/irda => drivers/staging/irda/net}/Makefile | 0 {net/irda => drivers/staging/irda/net}/af_irda.c | 0 {net/irda => drivers/staging/irda/net}/discovery.c | 0 {net/irda => drivers/staging/irda/net}/ircomm/Kconfig | 0 {net/irda => drivers/staging/irda/net}/ircomm/Makefile | 0 {net/irda => drivers/staging/irda/net}/ircomm/ircomm_core.c | 0 .../irda => drivers/staging/irda/net}/ircomm/ircomm_event.c | 0 {net/irda => drivers/staging/irda/net}/ircomm/ircomm_lmp.c | 0 .../irda => drivers/staging/irda/net}/ircomm/ircomm_param.c | 0 {net/irda => drivers/staging/irda/net}/ircomm/ircomm_ttp.c | 0 {net/irda => drivers/staging/irda/net}/ircomm/ircomm_tty.c | 0 .../staging/irda/net}/ircomm/ircomm_tty_attach.c | 0 .../staging/irda/net}/ircomm/ircomm_tty_ioctl.c | 0 {net/irda => drivers/staging/irda/net}/irda_device.c | 0 {net/irda => drivers/staging/irda/net}/iriap.c | 0 {net/irda => drivers/staging/irda/net}/iriap_event.c | 0 {net/irda => drivers/staging/irda/net}/irias_object.c | 0 {net/irda => drivers/staging/irda/net}/irlan/Kconfig | 0 {net/irda => drivers/staging/irda/net}/irlan/Makefile | 0 {net/irda => drivers/staging/irda/net}/irlan/irlan_client.c | 0 .../staging/irda/net}/irlan/irlan_client_event.c | 0 {net/irda => drivers/staging/irda/net}/irlan/irlan_common.c | 0 {net/irda => drivers/staging/irda/net}/irlan/irlan_eth.c | 0 {net/irda => drivers/staging/irda/net}/irlan/irlan_event.c | 0 {net/irda => drivers/staging/irda/net}/irlan/irlan_filter.c | 0 .../staging/irda/net}/irlan/irlan_provider.c | 0 .../staging/irda/net}/irlan/irlan_provider_event.c | 0 {net/irda => drivers/staging/irda/net}/irlap.c | 0 {net/irda => drivers/staging/irda/net}/irlap_event.c | 0 {net/irda => drivers/staging/irda/net}/irlap_frame.c | 0 {net/irda => drivers/staging/irda/net}/irlmp.c | 0 {net/irda => drivers/staging/irda/net}/irlmp_event.c | 0 {net/irda => drivers/staging/irda/net}/irlmp_frame.c | 0 {net/irda => drivers/staging/irda/net}/irmod.c | 0 {net/irda => drivers/staging/irda/net}/irnet/Kconfig | 0 {net/irda => drivers/staging/irda/net}/irnet/Makefile | 0 {net/irda => drivers/staging/irda/net}/irnet/irnet.h | 0 {net/irda => drivers/staging/irda/net}/irnet/irnet_irda.c | 0 {net/irda => drivers/staging/irda/net}/irnet/irnet_irda.h | 0 {net/irda => drivers/staging/irda/net}/irnet/irnet_ppp.c | 0 {net/irda => drivers/staging/irda/net}/irnet/irnet_ppp.h | 0 {net/irda => drivers/staging/irda/net}/irnetlink.c | 0 {net/irda => drivers/staging/irda/net}/irproc.c | 0 {net/irda => drivers/staging/irda/net}/irqueue.c | 0 {net/irda => drivers/staging/irda/net}/irsysctl.c | 0 {net/irda => drivers/staging/irda/net}/irttp.c | 0 {net/irda => drivers/staging/irda/net}/parameters.c | 0 {net/irda => drivers/staging/irda/net}/qos.c | 0 {net/irda => drivers/staging/irda/net}/timer.c | 0 {net/irda => drivers/staging/irda/net}/wrapper.c | 0 net/Kconfig | 1 - net/Makefile | 1 - 55 files changed, 6 insertions(+), 5 deletions(-) rename {net/irda => drivers/staging/irda/net}/Kconfig (95%) rename {net/irda => drivers/staging/irda/net}/Makefile (100%) rename {net/irda => drivers/staging/irda/net}/af_irda.c (100%) rename {net/irda => drivers/staging/irda/net}/discovery.c (100%) rename {net/irda => drivers/staging/irda/net}/ircomm/Kconfig (100%) rename {net/irda => drivers/staging/irda/net}/ircomm/Makefile (100%) rename {net/irda => drivers/staging/irda/net}/ircomm/ircomm_core.c (100%) rename {net/irda => drivers/staging/irda/net}/ircomm/ircomm_event.c (100%) rename {net/irda => drivers/staging/irda/net}/ircomm/ircomm_lmp.c (100%) rename {net/irda => drivers/staging/irda/net}/ircomm/ircomm_param.c (100%) rename {net/irda => drivers/staging/irda/net}/ircomm/ircomm_ttp.c (100%) rename {net/irda => drivers/staging/irda/net}/ircomm/ircomm_tty.c (100%) rename {net/irda => drivers/staging/irda/net}/ircomm/ircomm_tty_attach.c (100%) rename {net/irda => drivers/staging/irda/net}/ircomm/ircomm_tty_ioctl.c (100%) rename {net/irda => drivers/staging/irda/net}/irda_device.c (100%) rename {net/irda => drivers/staging/irda/net}/iriap.c (100%) rename {net/irda => drivers/staging/irda/net}/iriap_event.c (100%) rename {net/irda => drivers/staging/irda/net}/irias_object.c (100%) rename {net/irda => drivers/staging/irda/net}/irlan/Kconfig (100%) rename {net/irda => drivers/staging/irda/net}/irlan/Makefile (100%) rename {net/irda => drivers/staging/irda/net}/irlan/irlan_client.c (100%) rename {net/irda => drivers/staging/irda/net}/irlan/irlan_client_event.c (100%) rename {net/irda => drivers/staging/irda/net}/irlan/irlan_common.c (100%) rename {net/irda => drivers/staging/irda/net}/irlan/irlan_eth.c (100%) rename {net/irda => drivers/staging/irda/net}/irlan/irlan_event.c (100%) rename {net/irda => drivers/staging/irda/net}/irlan/irlan_filter.c (100%) rename {net/irda => drivers/staging/irda/net}/irlan/irlan_provider.c (100%) rename {net/irda => drivers/staging/irda/net}/irlan/irlan_provider_event.c (100%) rename {net/irda => drivers/staging/irda/net}/irlap.c (100%) rename {net/irda => drivers/staging/irda/net}/irlap_event.c (100%) rename {net/irda => drivers/staging/irda/net}/irlap_frame.c (100%) rename {net/irda => drivers/staging/irda/net}/irlmp.c (100%) rename {net/irda => drivers/staging/irda/net}/irlmp_event.c (100%) rename {net/irda => drivers/staging/irda/net}/irlmp_frame.c (100%) rename {net/irda => drivers/staging/irda/net}/irmod.c (100%) rename {net/irda => drivers/staging/irda/net}/irnet/Kconfig (100%) rename {net/irda => drivers/staging/irda/net}/irnet/Makefile (100%) rename {net/irda => drivers/staging/irda/net}/irnet/irnet.h (100%) rename {net/irda => drivers/staging/irda/net}/irnet/irnet_irda.c (100%) rename {net/irda => drivers/staging/irda/net}/irnet/irnet_irda.h (100%) rename {net/irda => drivers/staging/irda/net}/irnet/irnet_ppp.c (100%) rename {net/irda => drivers/staging/irda/net}/irnet/irnet_ppp.h (100%) rename {net/irda => drivers/staging/irda/net}/irnetlink.c (100%) rename {net/irda => drivers/staging/irda/net}/irproc.c (100%) rename {net/irda => drivers/staging/irda/net}/irqueue.c (100%) rename {net/irda => drivers/staging/irda/net}/irsysctl.c (100%) rename {net/irda => drivers/staging/irda/net}/irttp.c (100%) rename {net/irda => drivers/staging/irda/net}/parameters.c (100%) rename {net/irda => drivers/staging/irda/net}/qos.c (100%) rename {net/irda => drivers/staging/irda/net}/timer.c (100%) rename {net/irda => drivers/staging/irda/net}/wrapper.c (100%) diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index ef28a1cb64ae..0c5086d878c6 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -24,6 +24,8 @@ menuconfig STAGING if STAGING +source "drivers/staging/irda/net/Kconfig" + source "drivers/staging/wlan-ng/Kconfig" source "drivers/staging/comedi/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 2918580bdb9e..509fbacf9a7e 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -2,6 +2,7 @@ obj-y += media/ obj-y += typec/ +obj-$(CONFIG_IRDA) += irda/net/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/ diff --git a/net/irda/Kconfig b/drivers/staging/irda/net/Kconfig similarity index 95% rename from net/irda/Kconfig rename to drivers/staging/irda/net/Kconfig index c8671a7ffb3c..cd775e1ea0e9 100644 --- a/net/irda/Kconfig +++ b/drivers/staging/irda/net/Kconfig @@ -27,11 +27,11 @@ menuconfig IRDA comment "IrDA protocols" depends on IRDA -source "net/irda/irlan/Kconfig" +source "drivers/staging/irda/net/irlan/Kconfig" -source "net/irda/irnet/Kconfig" +source "drivers/staging/irda/net/irnet/Kconfig" -source "net/irda/ircomm/Kconfig" +source "drivers/staging/irda/net/ircomm/Kconfig" config IRDA_ULTRA bool "Ultra (connectionless) protocol" diff --git a/net/irda/Makefile b/drivers/staging/irda/net/Makefile similarity index 100% rename from net/irda/Makefile rename to drivers/staging/irda/net/Makefile diff --git a/net/irda/af_irda.c b/drivers/staging/irda/net/af_irda.c similarity index 100% rename from net/irda/af_irda.c rename to drivers/staging/irda/net/af_irda.c diff --git a/net/irda/discovery.c b/drivers/staging/irda/net/discovery.c similarity index 100% rename from net/irda/discovery.c rename to drivers/staging/irda/net/discovery.c diff --git a/net/irda/ircomm/Kconfig b/drivers/staging/irda/net/ircomm/Kconfig similarity index 100% rename from net/irda/ircomm/Kconfig rename to drivers/staging/irda/net/ircomm/Kconfig diff --git a/net/irda/ircomm/Makefile b/drivers/staging/irda/net/ircomm/Makefile similarity index 100% rename from net/irda/ircomm/Makefile rename to drivers/staging/irda/net/ircomm/Makefile diff --git a/net/irda/ircomm/ircomm_core.c b/drivers/staging/irda/net/ircomm/ircomm_core.c similarity index 100% rename from net/irda/ircomm/ircomm_core.c rename to drivers/staging/irda/net/ircomm/ircomm_core.c diff --git a/net/irda/ircomm/ircomm_event.c b/drivers/staging/irda/net/ircomm/ircomm_event.c similarity index 100% rename from net/irda/ircomm/ircomm_event.c rename to drivers/staging/irda/net/ircomm/ircomm_event.c diff --git a/net/irda/ircomm/ircomm_lmp.c b/drivers/staging/irda/net/ircomm/ircomm_lmp.c similarity index 100% rename from net/irda/ircomm/ircomm_lmp.c rename to drivers/staging/irda/net/ircomm/ircomm_lmp.c diff --git a/net/irda/ircomm/ircomm_param.c b/drivers/staging/irda/net/ircomm/ircomm_param.c similarity index 100% rename from net/irda/ircomm/ircomm_param.c rename to drivers/staging/irda/net/ircomm/ircomm_param.c diff --git a/net/irda/ircomm/ircomm_ttp.c b/drivers/staging/irda/net/ircomm/ircomm_ttp.c similarity index 100% rename from net/irda/ircomm/ircomm_ttp.c rename to drivers/staging/irda/net/ircomm/ircomm_ttp.c diff --git a/net/irda/ircomm/ircomm_tty.c b/drivers/staging/irda/net/ircomm/ircomm_tty.c similarity index 100% rename from net/irda/ircomm/ircomm_tty.c rename to drivers/staging/irda/net/ircomm/ircomm_tty.c diff --git a/net/irda/ircomm/ircomm_tty_attach.c b/drivers/staging/irda/net/ircomm/ircomm_tty_attach.c similarity index 100% rename from net/irda/ircomm/ircomm_tty_attach.c rename to drivers/staging/irda/net/ircomm/ircomm_tty_attach.c diff --git a/net/irda/ircomm/ircomm_tty_ioctl.c b/drivers/staging/irda/net/ircomm/ircomm_tty_ioctl.c similarity index 100% rename from net/irda/ircomm/ircomm_tty_ioctl.c rename to drivers/staging/irda/net/ircomm/ircomm_tty_ioctl.c diff --git a/net/irda/irda_device.c b/drivers/staging/irda/net/irda_device.c similarity index 100% rename from net/irda/irda_device.c rename to drivers/staging/irda/net/irda_device.c diff --git a/net/irda/iriap.c b/drivers/staging/irda/net/iriap.c similarity index 100% rename from net/irda/iriap.c rename to drivers/staging/irda/net/iriap.c diff --git a/net/irda/iriap_event.c b/drivers/staging/irda/net/iriap_event.c similarity index 100% rename from net/irda/iriap_event.c rename to drivers/staging/irda/net/iriap_event.c diff --git a/net/irda/irias_object.c b/drivers/staging/irda/net/irias_object.c similarity index 100% rename from net/irda/irias_object.c rename to drivers/staging/irda/net/irias_object.c diff --git a/net/irda/irlan/Kconfig b/drivers/staging/irda/net/irlan/Kconfig similarity index 100% rename from net/irda/irlan/Kconfig rename to drivers/staging/irda/net/irlan/Kconfig diff --git a/net/irda/irlan/Makefile b/drivers/staging/irda/net/irlan/Makefile similarity index 100% rename from net/irda/irlan/Makefile rename to drivers/staging/irda/net/irlan/Makefile diff --git a/net/irda/irlan/irlan_client.c b/drivers/staging/irda/net/irlan/irlan_client.c similarity index 100% rename from net/irda/irlan/irlan_client.c rename to drivers/staging/irda/net/irlan/irlan_client.c diff --git a/net/irda/irlan/irlan_client_event.c b/drivers/staging/irda/net/irlan/irlan_client_event.c similarity index 100% rename from net/irda/irlan/irlan_client_event.c rename to drivers/staging/irda/net/irlan/irlan_client_event.c diff --git a/net/irda/irlan/irlan_common.c b/drivers/staging/irda/net/irlan/irlan_common.c similarity index 100% rename from net/irda/irlan/irlan_common.c rename to drivers/staging/irda/net/irlan/irlan_common.c diff --git a/net/irda/irlan/irlan_eth.c b/drivers/staging/irda/net/irlan/irlan_eth.c similarity index 100% rename from net/irda/irlan/irlan_eth.c rename to drivers/staging/irda/net/irlan/irlan_eth.c diff --git a/net/irda/irlan/irlan_event.c b/drivers/staging/irda/net/irlan/irlan_event.c similarity index 100% rename from net/irda/irlan/irlan_event.c rename to drivers/staging/irda/net/irlan/irlan_event.c diff --git a/net/irda/irlan/irlan_filter.c b/drivers/staging/irda/net/irlan/irlan_filter.c similarity index 100% rename from net/irda/irlan/irlan_filter.c rename to drivers/staging/irda/net/irlan/irlan_filter.c diff --git a/net/irda/irlan/irlan_provider.c b/drivers/staging/irda/net/irlan/irlan_provider.c similarity index 100% rename from net/irda/irlan/irlan_provider.c rename to drivers/staging/irda/net/irlan/irlan_provider.c diff --git a/net/irda/irlan/irlan_provider_event.c b/drivers/staging/irda/net/irlan/irlan_provider_event.c similarity index 100% rename from net/irda/irlan/irlan_provider_event.c rename to drivers/staging/irda/net/irlan/irlan_provider_event.c diff --git a/net/irda/irlap.c b/drivers/staging/irda/net/irlap.c similarity index 100% rename from net/irda/irlap.c rename to drivers/staging/irda/net/irlap.c diff --git a/net/irda/irlap_event.c b/drivers/staging/irda/net/irlap_event.c similarity index 100% rename from net/irda/irlap_event.c rename to drivers/staging/irda/net/irlap_event.c diff --git a/net/irda/irlap_frame.c b/drivers/staging/irda/net/irlap_frame.c similarity index 100% rename from net/irda/irlap_frame.c rename to drivers/staging/irda/net/irlap_frame.c diff --git a/net/irda/irlmp.c b/drivers/staging/irda/net/irlmp.c similarity index 100% rename from net/irda/irlmp.c rename to drivers/staging/irda/net/irlmp.c diff --git a/net/irda/irlmp_event.c b/drivers/staging/irda/net/irlmp_event.c similarity index 100% rename from net/irda/irlmp_event.c rename to drivers/staging/irda/net/irlmp_event.c diff --git a/net/irda/irlmp_frame.c b/drivers/staging/irda/net/irlmp_frame.c similarity index 100% rename from net/irda/irlmp_frame.c rename to drivers/staging/irda/net/irlmp_frame.c diff --git a/net/irda/irmod.c b/drivers/staging/irda/net/irmod.c similarity index 100% rename from net/irda/irmod.c rename to drivers/staging/irda/net/irmod.c diff --git a/net/irda/irnet/Kconfig b/drivers/staging/irda/net/irnet/Kconfig similarity index 100% rename from net/irda/irnet/Kconfig rename to drivers/staging/irda/net/irnet/Kconfig diff --git a/net/irda/irnet/Makefile b/drivers/staging/irda/net/irnet/Makefile similarity index 100% rename from net/irda/irnet/Makefile rename to drivers/staging/irda/net/irnet/Makefile diff --git a/net/irda/irnet/irnet.h b/drivers/staging/irda/net/irnet/irnet.h similarity index 100% rename from net/irda/irnet/irnet.h rename to drivers/staging/irda/net/irnet/irnet.h diff --git a/net/irda/irnet/irnet_irda.c b/drivers/staging/irda/net/irnet/irnet_irda.c similarity index 100% rename from net/irda/irnet/irnet_irda.c rename to drivers/staging/irda/net/irnet/irnet_irda.c diff --git a/net/irda/irnet/irnet_irda.h b/drivers/staging/irda/net/irnet/irnet_irda.h similarity index 100% rename from net/irda/irnet/irnet_irda.h rename to drivers/staging/irda/net/irnet/irnet_irda.h diff --git a/net/irda/irnet/irnet_ppp.c b/drivers/staging/irda/net/irnet/irnet_ppp.c similarity index 100% rename from net/irda/irnet/irnet_ppp.c rename to drivers/staging/irda/net/irnet/irnet_ppp.c diff --git a/net/irda/irnet/irnet_ppp.h b/drivers/staging/irda/net/irnet/irnet_ppp.h similarity index 100% rename from net/irda/irnet/irnet_ppp.h rename to drivers/staging/irda/net/irnet/irnet_ppp.h diff --git a/net/irda/irnetlink.c b/drivers/staging/irda/net/irnetlink.c similarity index 100% rename from net/irda/irnetlink.c rename to drivers/staging/irda/net/irnetlink.c diff --git a/net/irda/irproc.c b/drivers/staging/irda/net/irproc.c similarity index 100% rename from net/irda/irproc.c rename to drivers/staging/irda/net/irproc.c diff --git a/net/irda/irqueue.c b/drivers/staging/irda/net/irqueue.c similarity index 100% rename from net/irda/irqueue.c rename to drivers/staging/irda/net/irqueue.c diff --git a/net/irda/irsysctl.c b/drivers/staging/irda/net/irsysctl.c similarity index 100% rename from net/irda/irsysctl.c rename to drivers/staging/irda/net/irsysctl.c diff --git a/net/irda/irttp.c b/drivers/staging/irda/net/irttp.c similarity index 100% rename from net/irda/irttp.c rename to drivers/staging/irda/net/irttp.c diff --git a/net/irda/parameters.c b/drivers/staging/irda/net/parameters.c similarity index 100% rename from net/irda/parameters.c rename to drivers/staging/irda/net/parameters.c diff --git a/net/irda/qos.c b/drivers/staging/irda/net/qos.c similarity index 100% rename from net/irda/qos.c rename to drivers/staging/irda/net/qos.c diff --git a/net/irda/timer.c b/drivers/staging/irda/net/timer.c similarity index 100% rename from net/irda/timer.c rename to drivers/staging/irda/net/timer.c diff --git a/net/irda/wrapper.c b/drivers/staging/irda/net/wrapper.c similarity index 100% rename from net/irda/wrapper.c rename to drivers/staging/irda/net/wrapper.c diff --git a/net/Kconfig b/net/Kconfig index 17ca213e1f85..8614a9ccfbef 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -376,7 +376,6 @@ endmenu source "net/ax25/Kconfig" source "net/can/Kconfig" -source "net/irda/Kconfig" source "net/bluetooth/Kconfig" source "net/rxrpc/Kconfig" source "net/kcm/Kconfig" diff --git a/net/Makefile b/net/Makefile index bed80fa398b7..3d3feff3643b 100644 --- a/net/Makefile +++ b/net/Makefile @@ -31,7 +31,6 @@ obj-$(CONFIG_NETROM) += netrom/ obj-$(CONFIG_ROSE) += rose/ obj-$(CONFIG_AX25) += ax25/ obj-$(CONFIG_CAN) += can/ -obj-$(CONFIG_IRDA) += irda/ obj-$(CONFIG_BT) += bluetooth/ obj-$(CONFIG_SUNRPC) += sunrpc/ obj-$(CONFIG_AF_RXRPC) += rxrpc/ From 6c391ff758eb9f41e11c6143fd5bdb3b3324bf9f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 27 Aug 2017 17:03:32 +0200 Subject: [PATCH 2/4] irda: move drivers/net/irda to drivers/staging/irda/drivers Move the irda drivers from drivers/net/irda/ to drivers/staging/irda/drivers as they will be deleted in a future kernel release. Signed-off-by: Greg Kroah-Hartman Signed-off-by: David S. Miller --- drivers/net/Makefile | 1 - drivers/staging/Makefile | 1 + drivers/{net/irda => staging/irda/drivers}/Kconfig | 0 drivers/{net/irda => staging/irda/drivers}/Makefile | 0 drivers/{net/irda => staging/irda/drivers}/act200l-sir.c | 0 drivers/{net/irda => staging/irda/drivers}/actisys-sir.c | 0 drivers/{net/irda => staging/irda/drivers}/ali-ircc.c | 0 drivers/{net/irda => staging/irda/drivers}/ali-ircc.h | 0 drivers/{net/irda => staging/irda/drivers}/au1k_ir.c | 0 drivers/{net/irda => staging/irda/drivers}/bfin_sir.c | 0 drivers/{net/irda => staging/irda/drivers}/bfin_sir.h | 0 drivers/{net/irda => staging/irda/drivers}/donauboe.c | 0 drivers/{net/irda => staging/irda/drivers}/donauboe.h | 0 drivers/{net/irda => staging/irda/drivers}/esi-sir.c | 0 drivers/{net/irda => staging/irda/drivers}/girbil-sir.c | 0 drivers/{net/irda => staging/irda/drivers}/irda-usb.c | 0 drivers/{net/irda => staging/irda/drivers}/irda-usb.h | 0 drivers/{net/irda => staging/irda/drivers}/irtty-sir.c | 0 drivers/{net/irda => staging/irda/drivers}/irtty-sir.h | 0 drivers/{net/irda => staging/irda/drivers}/kingsun-sir.c | 0 drivers/{net/irda => staging/irda/drivers}/ks959-sir.c | 0 drivers/{net/irda => staging/irda/drivers}/ksdazzle-sir.c | 0 drivers/{net/irda => staging/irda/drivers}/litelink-sir.c | 0 drivers/{net/irda => staging/irda/drivers}/ma600-sir.c | 0 drivers/{net/irda => staging/irda/drivers}/mcp2120-sir.c | 0 drivers/{net/irda => staging/irda/drivers}/mcs7780.c | 0 drivers/{net/irda => staging/irda/drivers}/mcs7780.h | 0 drivers/{net/irda => staging/irda/drivers}/nsc-ircc.c | 0 drivers/{net/irda => staging/irda/drivers}/nsc-ircc.h | 0 drivers/{net/irda => staging/irda/drivers}/old_belkin-sir.c | 0 drivers/{net/irda => staging/irda/drivers}/pxaficp_ir.c | 0 drivers/{net/irda => staging/irda/drivers}/sa1100_ir.c | 0 drivers/{net/irda => staging/irda/drivers}/sh_sir.c | 0 drivers/{net/irda => staging/irda/drivers}/sir-dev.h | 0 drivers/{net/irda => staging/irda/drivers}/sir_dev.c | 0 drivers/{net/irda => staging/irda/drivers}/sir_dongle.c | 0 drivers/{net/irda => staging/irda/drivers}/smsc-ircc2.c | 0 drivers/{net/irda => staging/irda/drivers}/smsc-ircc2.h | 0 drivers/{net/irda => staging/irda/drivers}/smsc-sio.h | 0 drivers/{net/irda => staging/irda/drivers}/stir4200.c | 0 drivers/{net/irda => staging/irda/drivers}/tekram-sir.c | 0 drivers/{net/irda => staging/irda/drivers}/toim3232-sir.c | 0 drivers/{net/irda => staging/irda/drivers}/via-ircc.c | 0 drivers/{net/irda => staging/irda/drivers}/via-ircc.h | 0 drivers/{net/irda => staging/irda/drivers}/vlsi_ir.c | 0 drivers/{net/irda => staging/irda/drivers}/vlsi_ir.h | 0 drivers/{net/irda => staging/irda/drivers}/w83977af.h | 0 drivers/{net/irda => staging/irda/drivers}/w83977af_ir.c | 0 drivers/{net/irda => staging/irda/drivers}/w83977af_ir.h | 0 drivers/staging/irda/net/Kconfig | 2 +- 50 files changed, 2 insertions(+), 2 deletions(-) rename drivers/{net/irda => staging/irda/drivers}/Kconfig (100%) rename drivers/{net/irda => staging/irda/drivers}/Makefile (100%) rename drivers/{net/irda => staging/irda/drivers}/act200l-sir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/actisys-sir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/ali-ircc.c (100%) rename drivers/{net/irda => staging/irda/drivers}/ali-ircc.h (100%) rename drivers/{net/irda => staging/irda/drivers}/au1k_ir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/bfin_sir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/bfin_sir.h (100%) rename drivers/{net/irda => staging/irda/drivers}/donauboe.c (100%) rename drivers/{net/irda => staging/irda/drivers}/donauboe.h (100%) rename drivers/{net/irda => staging/irda/drivers}/esi-sir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/girbil-sir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/irda-usb.c (100%) rename drivers/{net/irda => staging/irda/drivers}/irda-usb.h (100%) rename drivers/{net/irda => staging/irda/drivers}/irtty-sir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/irtty-sir.h (100%) rename drivers/{net/irda => staging/irda/drivers}/kingsun-sir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/ks959-sir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/ksdazzle-sir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/litelink-sir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/ma600-sir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/mcp2120-sir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/mcs7780.c (100%) rename drivers/{net/irda => staging/irda/drivers}/mcs7780.h (100%) rename drivers/{net/irda => staging/irda/drivers}/nsc-ircc.c (100%) rename drivers/{net/irda => staging/irda/drivers}/nsc-ircc.h (100%) rename drivers/{net/irda => staging/irda/drivers}/old_belkin-sir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/pxaficp_ir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/sa1100_ir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/sh_sir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/sir-dev.h (100%) rename drivers/{net/irda => staging/irda/drivers}/sir_dev.c (100%) rename drivers/{net/irda => staging/irda/drivers}/sir_dongle.c (100%) rename drivers/{net/irda => staging/irda/drivers}/smsc-ircc2.c (100%) rename drivers/{net/irda => staging/irda/drivers}/smsc-ircc2.h (100%) rename drivers/{net/irda => staging/irda/drivers}/smsc-sio.h (100%) rename drivers/{net/irda => staging/irda/drivers}/stir4200.c (100%) rename drivers/{net/irda => staging/irda/drivers}/tekram-sir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/toim3232-sir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/via-ircc.c (100%) rename drivers/{net/irda => staging/irda/drivers}/via-ircc.h (100%) rename drivers/{net/irda => staging/irda/drivers}/vlsi_ir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/vlsi_ir.h (100%) rename drivers/{net/irda => staging/irda/drivers}/w83977af.h (100%) rename drivers/{net/irda => staging/irda/drivers}/w83977af_ir.c (100%) rename drivers/{net/irda => staging/irda/drivers}/w83977af_ir.h (100%) diff --git a/drivers/net/Makefile b/drivers/net/Makefile index b2f6556d8848..8dff900085d6 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -45,7 +45,6 @@ obj-$(CONFIG_ETHERNET) += ethernet/ obj-$(CONFIG_FDDI) += fddi/ obj-$(CONFIG_HIPPI) += hippi/ obj-$(CONFIG_HAMRADIO) += hamradio/ -obj-$(CONFIG_IRDA) += irda/ obj-$(CONFIG_PLIP) += plip/ obj-$(CONFIG_PPP) += ppp/ obj-$(CONFIG_PPP_ASYNC) += ppp/ diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 509fbacf9a7e..fced929a0e67 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -3,6 +3,7 @@ obj-y += media/ obj-y += typec/ obj-$(CONFIG_IRDA) += irda/net/ +obj-$(CONFIG_IRDA) += irda/drivers/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/ diff --git a/drivers/net/irda/Kconfig b/drivers/staging/irda/drivers/Kconfig similarity index 100% rename from drivers/net/irda/Kconfig rename to drivers/staging/irda/drivers/Kconfig diff --git a/drivers/net/irda/Makefile b/drivers/staging/irda/drivers/Makefile similarity index 100% rename from drivers/net/irda/Makefile rename to drivers/staging/irda/drivers/Makefile diff --git a/drivers/net/irda/act200l-sir.c b/drivers/staging/irda/drivers/act200l-sir.c similarity index 100% rename from drivers/net/irda/act200l-sir.c rename to drivers/staging/irda/drivers/act200l-sir.c diff --git a/drivers/net/irda/actisys-sir.c b/drivers/staging/irda/drivers/actisys-sir.c similarity index 100% rename from drivers/net/irda/actisys-sir.c rename to drivers/staging/irda/drivers/actisys-sir.c diff --git a/drivers/net/irda/ali-ircc.c b/drivers/staging/irda/drivers/ali-ircc.c similarity index 100% rename from drivers/net/irda/ali-ircc.c rename to drivers/staging/irda/drivers/ali-ircc.c diff --git a/drivers/net/irda/ali-ircc.h b/drivers/staging/irda/drivers/ali-ircc.h similarity index 100% rename from drivers/net/irda/ali-ircc.h rename to drivers/staging/irda/drivers/ali-ircc.h diff --git a/drivers/net/irda/au1k_ir.c b/drivers/staging/irda/drivers/au1k_ir.c similarity index 100% rename from drivers/net/irda/au1k_ir.c rename to drivers/staging/irda/drivers/au1k_ir.c diff --git a/drivers/net/irda/bfin_sir.c b/drivers/staging/irda/drivers/bfin_sir.c similarity index 100% rename from drivers/net/irda/bfin_sir.c rename to drivers/staging/irda/drivers/bfin_sir.c diff --git a/drivers/net/irda/bfin_sir.h b/drivers/staging/irda/drivers/bfin_sir.h similarity index 100% rename from drivers/net/irda/bfin_sir.h rename to drivers/staging/irda/drivers/bfin_sir.h diff --git a/drivers/net/irda/donauboe.c b/drivers/staging/irda/drivers/donauboe.c similarity index 100% rename from drivers/net/irda/donauboe.c rename to drivers/staging/irda/drivers/donauboe.c diff --git a/drivers/net/irda/donauboe.h b/drivers/staging/irda/drivers/donauboe.h similarity index 100% rename from drivers/net/irda/donauboe.h rename to drivers/staging/irda/drivers/donauboe.h diff --git a/drivers/net/irda/esi-sir.c b/drivers/staging/irda/drivers/esi-sir.c similarity index 100% rename from drivers/net/irda/esi-sir.c rename to drivers/staging/irda/drivers/esi-sir.c diff --git a/drivers/net/irda/girbil-sir.c b/drivers/staging/irda/drivers/girbil-sir.c similarity index 100% rename from drivers/net/irda/girbil-sir.c rename to drivers/staging/irda/drivers/girbil-sir.c diff --git a/drivers/net/irda/irda-usb.c b/drivers/staging/irda/drivers/irda-usb.c similarity index 100% rename from drivers/net/irda/irda-usb.c rename to drivers/staging/irda/drivers/irda-usb.c diff --git a/drivers/net/irda/irda-usb.h b/drivers/staging/irda/drivers/irda-usb.h similarity index 100% rename from drivers/net/irda/irda-usb.h rename to drivers/staging/irda/drivers/irda-usb.h diff --git a/drivers/net/irda/irtty-sir.c b/drivers/staging/irda/drivers/irtty-sir.c similarity index 100% rename from drivers/net/irda/irtty-sir.c rename to drivers/staging/irda/drivers/irtty-sir.c diff --git a/drivers/net/irda/irtty-sir.h b/drivers/staging/irda/drivers/irtty-sir.h similarity index 100% rename from drivers/net/irda/irtty-sir.h rename to drivers/staging/irda/drivers/irtty-sir.h diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/staging/irda/drivers/kingsun-sir.c similarity index 100% rename from drivers/net/irda/kingsun-sir.c rename to drivers/staging/irda/drivers/kingsun-sir.c diff --git a/drivers/net/irda/ks959-sir.c b/drivers/staging/irda/drivers/ks959-sir.c similarity index 100% rename from drivers/net/irda/ks959-sir.c rename to drivers/staging/irda/drivers/ks959-sir.c diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/staging/irda/drivers/ksdazzle-sir.c similarity index 100% rename from drivers/net/irda/ksdazzle-sir.c rename to drivers/staging/irda/drivers/ksdazzle-sir.c diff --git a/drivers/net/irda/litelink-sir.c b/drivers/staging/irda/drivers/litelink-sir.c similarity index 100% rename from drivers/net/irda/litelink-sir.c rename to drivers/staging/irda/drivers/litelink-sir.c diff --git a/drivers/net/irda/ma600-sir.c b/drivers/staging/irda/drivers/ma600-sir.c similarity index 100% rename from drivers/net/irda/ma600-sir.c rename to drivers/staging/irda/drivers/ma600-sir.c diff --git a/drivers/net/irda/mcp2120-sir.c b/drivers/staging/irda/drivers/mcp2120-sir.c similarity index 100% rename from drivers/net/irda/mcp2120-sir.c rename to drivers/staging/irda/drivers/mcp2120-sir.c diff --git a/drivers/net/irda/mcs7780.c b/drivers/staging/irda/drivers/mcs7780.c similarity index 100% rename from drivers/net/irda/mcs7780.c rename to drivers/staging/irda/drivers/mcs7780.c diff --git a/drivers/net/irda/mcs7780.h b/drivers/staging/irda/drivers/mcs7780.h similarity index 100% rename from drivers/net/irda/mcs7780.h rename to drivers/staging/irda/drivers/mcs7780.h diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/staging/irda/drivers/nsc-ircc.c similarity index 100% rename from drivers/net/irda/nsc-ircc.c rename to drivers/staging/irda/drivers/nsc-ircc.c diff --git a/drivers/net/irda/nsc-ircc.h b/drivers/staging/irda/drivers/nsc-ircc.h similarity index 100% rename from drivers/net/irda/nsc-ircc.h rename to drivers/staging/irda/drivers/nsc-ircc.h diff --git a/drivers/net/irda/old_belkin-sir.c b/drivers/staging/irda/drivers/old_belkin-sir.c similarity index 100% rename from drivers/net/irda/old_belkin-sir.c rename to drivers/staging/irda/drivers/old_belkin-sir.c diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/staging/irda/drivers/pxaficp_ir.c similarity index 100% rename from drivers/net/irda/pxaficp_ir.c rename to drivers/staging/irda/drivers/pxaficp_ir.c diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/staging/irda/drivers/sa1100_ir.c similarity index 100% rename from drivers/net/irda/sa1100_ir.c rename to drivers/staging/irda/drivers/sa1100_ir.c diff --git a/drivers/net/irda/sh_sir.c b/drivers/staging/irda/drivers/sh_sir.c similarity index 100% rename from drivers/net/irda/sh_sir.c rename to drivers/staging/irda/drivers/sh_sir.c diff --git a/drivers/net/irda/sir-dev.h b/drivers/staging/irda/drivers/sir-dev.h similarity index 100% rename from drivers/net/irda/sir-dev.h rename to drivers/staging/irda/drivers/sir-dev.h diff --git a/drivers/net/irda/sir_dev.c b/drivers/staging/irda/drivers/sir_dev.c similarity index 100% rename from drivers/net/irda/sir_dev.c rename to drivers/staging/irda/drivers/sir_dev.c diff --git a/drivers/net/irda/sir_dongle.c b/drivers/staging/irda/drivers/sir_dongle.c similarity index 100% rename from drivers/net/irda/sir_dongle.c rename to drivers/staging/irda/drivers/sir_dongle.c diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/staging/irda/drivers/smsc-ircc2.c similarity index 100% rename from drivers/net/irda/smsc-ircc2.c rename to drivers/staging/irda/drivers/smsc-ircc2.c diff --git a/drivers/net/irda/smsc-ircc2.h b/drivers/staging/irda/drivers/smsc-ircc2.h similarity index 100% rename from drivers/net/irda/smsc-ircc2.h rename to drivers/staging/irda/drivers/smsc-ircc2.h diff --git a/drivers/net/irda/smsc-sio.h b/drivers/staging/irda/drivers/smsc-sio.h similarity index 100% rename from drivers/net/irda/smsc-sio.h rename to drivers/staging/irda/drivers/smsc-sio.h diff --git a/drivers/net/irda/stir4200.c b/drivers/staging/irda/drivers/stir4200.c similarity index 100% rename from drivers/net/irda/stir4200.c rename to drivers/staging/irda/drivers/stir4200.c diff --git a/drivers/net/irda/tekram-sir.c b/drivers/staging/irda/drivers/tekram-sir.c similarity index 100% rename from drivers/net/irda/tekram-sir.c rename to drivers/staging/irda/drivers/tekram-sir.c diff --git a/drivers/net/irda/toim3232-sir.c b/drivers/staging/irda/drivers/toim3232-sir.c similarity index 100% rename from drivers/net/irda/toim3232-sir.c rename to drivers/staging/irda/drivers/toim3232-sir.c diff --git a/drivers/net/irda/via-ircc.c b/drivers/staging/irda/drivers/via-ircc.c similarity index 100% rename from drivers/net/irda/via-ircc.c rename to drivers/staging/irda/drivers/via-ircc.c diff --git a/drivers/net/irda/via-ircc.h b/drivers/staging/irda/drivers/via-ircc.h similarity index 100% rename from drivers/net/irda/via-ircc.h rename to drivers/staging/irda/drivers/via-ircc.h diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/staging/irda/drivers/vlsi_ir.c similarity index 100% rename from drivers/net/irda/vlsi_ir.c rename to drivers/staging/irda/drivers/vlsi_ir.c diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/staging/irda/drivers/vlsi_ir.h similarity index 100% rename from drivers/net/irda/vlsi_ir.h rename to drivers/staging/irda/drivers/vlsi_ir.h diff --git a/drivers/net/irda/w83977af.h b/drivers/staging/irda/drivers/w83977af.h similarity index 100% rename from drivers/net/irda/w83977af.h rename to drivers/staging/irda/drivers/w83977af.h diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/staging/irda/drivers/w83977af_ir.c similarity index 100% rename from drivers/net/irda/w83977af_ir.c rename to drivers/staging/irda/drivers/w83977af_ir.c diff --git a/drivers/net/irda/w83977af_ir.h b/drivers/staging/irda/drivers/w83977af_ir.h similarity index 100% rename from drivers/net/irda/w83977af_ir.h rename to drivers/staging/irda/drivers/w83977af_ir.h diff --git a/drivers/staging/irda/net/Kconfig b/drivers/staging/irda/net/Kconfig index cd775e1ea0e9..6abeae6c666a 100644 --- a/drivers/staging/irda/net/Kconfig +++ b/drivers/staging/irda/net/Kconfig @@ -92,5 +92,5 @@ config IRDA_DEBUG If unsure, say Y (since it makes it easier to find the bugs). -source "drivers/net/irda/Kconfig" +source "drivers/staging/irda/drivers/Kconfig" From 5bf916ee0ab638c86edeaf4caeeade9ddf44d95d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 27 Aug 2017 17:03:33 +0200 Subject: [PATCH 3/4] irda: move include/net/irda into staging subdirectory And finally, move the irda include files into drivers/staging/irda/include/net/irda. Yes, it's a long path, but it makes it easy for us to just add a Makefile directory path addition and all of the net and drivers code "just works". Signed-off-by: Greg Kroah-Hartman Signed-off-by: David S. Miller --- drivers/staging/irda/drivers/Makefile | 2 ++ {include => drivers/staging/irda/include}/net/irda/af_irda.h | 0 {include => drivers/staging/irda/include}/net/irda/crc.h | 0 {include => drivers/staging/irda/include}/net/irda/discovery.h | 0 .../staging/irda/include}/net/irda/ircomm_core.h | 0 .../staging/irda/include}/net/irda/ircomm_event.h | 0 {include => drivers/staging/irda/include}/net/irda/ircomm_lmp.h | 0 .../staging/irda/include}/net/irda/ircomm_param.h | 0 {include => drivers/staging/irda/include}/net/irda/ircomm_ttp.h | 0 {include => drivers/staging/irda/include}/net/irda/ircomm_tty.h | 0 .../staging/irda/include}/net/irda/ircomm_tty_attach.h | 0 {include => drivers/staging/irda/include}/net/irda/irda.h | 0 .../staging/irda/include}/net/irda/irda_device.h | 0 {include => drivers/staging/irda/include}/net/irda/iriap.h | 0 .../staging/irda/include}/net/irda/iriap_event.h | 0 .../staging/irda/include}/net/irda/irias_object.h | 0 .../staging/irda/include}/net/irda/irlan_client.h | 0 .../staging/irda/include}/net/irda/irlan_common.h | 0 {include => drivers/staging/irda/include}/net/irda/irlan_eth.h | 0 .../staging/irda/include}/net/irda/irlan_event.h | 0 .../staging/irda/include}/net/irda/irlan_filter.h | 0 .../staging/irda/include}/net/irda/irlan_provider.h | 0 {include => drivers/staging/irda/include}/net/irda/irlap.h | 0 .../staging/irda/include}/net/irda/irlap_event.h | 0 .../staging/irda/include}/net/irda/irlap_frame.h | 0 {include => drivers/staging/irda/include}/net/irda/irlmp.h | 0 .../staging/irda/include}/net/irda/irlmp_event.h | 0 .../staging/irda/include}/net/irda/irlmp_frame.h | 0 {include => drivers/staging/irda/include}/net/irda/irmod.h | 0 {include => drivers/staging/irda/include}/net/irda/irqueue.h | 0 {include => drivers/staging/irda/include}/net/irda/irttp.h | 0 {include => drivers/staging/irda/include}/net/irda/parameters.h | 0 {include => drivers/staging/irda/include}/net/irda/qos.h | 0 {include => drivers/staging/irda/include}/net/irda/timer.h | 0 {include => drivers/staging/irda/include}/net/irda/wrapper.h | 0 drivers/staging/irda/net/Makefile | 2 ++ 36 files changed, 4 insertions(+) rename {include => drivers/staging/irda/include}/net/irda/af_irda.h (100%) rename {include => drivers/staging/irda/include}/net/irda/crc.h (100%) rename {include => drivers/staging/irda/include}/net/irda/discovery.h (100%) rename {include => drivers/staging/irda/include}/net/irda/ircomm_core.h (100%) rename {include => drivers/staging/irda/include}/net/irda/ircomm_event.h (100%) rename {include => drivers/staging/irda/include}/net/irda/ircomm_lmp.h (100%) rename {include => drivers/staging/irda/include}/net/irda/ircomm_param.h (100%) rename {include => drivers/staging/irda/include}/net/irda/ircomm_ttp.h (100%) rename {include => drivers/staging/irda/include}/net/irda/ircomm_tty.h (100%) rename {include => drivers/staging/irda/include}/net/irda/ircomm_tty_attach.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irda.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irda_device.h (100%) rename {include => drivers/staging/irda/include}/net/irda/iriap.h (100%) rename {include => drivers/staging/irda/include}/net/irda/iriap_event.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irias_object.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irlan_client.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irlan_common.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irlan_eth.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irlan_event.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irlan_filter.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irlan_provider.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irlap.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irlap_event.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irlap_frame.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irlmp.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irlmp_event.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irlmp_frame.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irmod.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irqueue.h (100%) rename {include => drivers/staging/irda/include}/net/irda/irttp.h (100%) rename {include => drivers/staging/irda/include}/net/irda/parameters.h (100%) rename {include => drivers/staging/irda/include}/net/irda/qos.h (100%) rename {include => drivers/staging/irda/include}/net/irda/timer.h (100%) rename {include => drivers/staging/irda/include}/net/irda/wrapper.h (100%) diff --git a/drivers/staging/irda/drivers/Makefile b/drivers/staging/irda/drivers/Makefile index 4c344433dae5..e2901b135528 100644 --- a/drivers/staging/irda/drivers/Makefile +++ b/drivers/staging/irda/drivers/Makefile @@ -5,6 +5,8 @@ # Rewritten to use lists instead of if-statements. # +subdir-ccflags-y += -I$(srctree)/drivers/staging/irda/include + # FIR drivers obj-$(CONFIG_USB_IRDA) += irda-usb.o obj-$(CONFIG_SIGMATEL_FIR) += stir4200.o diff --git a/include/net/irda/af_irda.h b/drivers/staging/irda/include/net/irda/af_irda.h similarity index 100% rename from include/net/irda/af_irda.h rename to drivers/staging/irda/include/net/irda/af_irda.h diff --git a/include/net/irda/crc.h b/drivers/staging/irda/include/net/irda/crc.h similarity index 100% rename from include/net/irda/crc.h rename to drivers/staging/irda/include/net/irda/crc.h diff --git a/include/net/irda/discovery.h b/drivers/staging/irda/include/net/irda/discovery.h similarity index 100% rename from include/net/irda/discovery.h rename to drivers/staging/irda/include/net/irda/discovery.h diff --git a/include/net/irda/ircomm_core.h b/drivers/staging/irda/include/net/irda/ircomm_core.h similarity index 100% rename from include/net/irda/ircomm_core.h rename to drivers/staging/irda/include/net/irda/ircomm_core.h diff --git a/include/net/irda/ircomm_event.h b/drivers/staging/irda/include/net/irda/ircomm_event.h similarity index 100% rename from include/net/irda/ircomm_event.h rename to drivers/staging/irda/include/net/irda/ircomm_event.h diff --git a/include/net/irda/ircomm_lmp.h b/drivers/staging/irda/include/net/irda/ircomm_lmp.h similarity index 100% rename from include/net/irda/ircomm_lmp.h rename to drivers/staging/irda/include/net/irda/ircomm_lmp.h diff --git a/include/net/irda/ircomm_param.h b/drivers/staging/irda/include/net/irda/ircomm_param.h similarity index 100% rename from include/net/irda/ircomm_param.h rename to drivers/staging/irda/include/net/irda/ircomm_param.h diff --git a/include/net/irda/ircomm_ttp.h b/drivers/staging/irda/include/net/irda/ircomm_ttp.h similarity index 100% rename from include/net/irda/ircomm_ttp.h rename to drivers/staging/irda/include/net/irda/ircomm_ttp.h diff --git a/include/net/irda/ircomm_tty.h b/drivers/staging/irda/include/net/irda/ircomm_tty.h similarity index 100% rename from include/net/irda/ircomm_tty.h rename to drivers/staging/irda/include/net/irda/ircomm_tty.h diff --git a/include/net/irda/ircomm_tty_attach.h b/drivers/staging/irda/include/net/irda/ircomm_tty_attach.h similarity index 100% rename from include/net/irda/ircomm_tty_attach.h rename to drivers/staging/irda/include/net/irda/ircomm_tty_attach.h diff --git a/include/net/irda/irda.h b/drivers/staging/irda/include/net/irda/irda.h similarity index 100% rename from include/net/irda/irda.h rename to drivers/staging/irda/include/net/irda/irda.h diff --git a/include/net/irda/irda_device.h b/drivers/staging/irda/include/net/irda/irda_device.h similarity index 100% rename from include/net/irda/irda_device.h rename to drivers/staging/irda/include/net/irda/irda_device.h diff --git a/include/net/irda/iriap.h b/drivers/staging/irda/include/net/irda/iriap.h similarity index 100% rename from include/net/irda/iriap.h rename to drivers/staging/irda/include/net/irda/iriap.h diff --git a/include/net/irda/iriap_event.h b/drivers/staging/irda/include/net/irda/iriap_event.h similarity index 100% rename from include/net/irda/iriap_event.h rename to drivers/staging/irda/include/net/irda/iriap_event.h diff --git a/include/net/irda/irias_object.h b/drivers/staging/irda/include/net/irda/irias_object.h similarity index 100% rename from include/net/irda/irias_object.h rename to drivers/staging/irda/include/net/irda/irias_object.h diff --git a/include/net/irda/irlan_client.h b/drivers/staging/irda/include/net/irda/irlan_client.h similarity index 100% rename from include/net/irda/irlan_client.h rename to drivers/staging/irda/include/net/irda/irlan_client.h diff --git a/include/net/irda/irlan_common.h b/drivers/staging/irda/include/net/irda/irlan_common.h similarity index 100% rename from include/net/irda/irlan_common.h rename to drivers/staging/irda/include/net/irda/irlan_common.h diff --git a/include/net/irda/irlan_eth.h b/drivers/staging/irda/include/net/irda/irlan_eth.h similarity index 100% rename from include/net/irda/irlan_eth.h rename to drivers/staging/irda/include/net/irda/irlan_eth.h diff --git a/include/net/irda/irlan_event.h b/drivers/staging/irda/include/net/irda/irlan_event.h similarity index 100% rename from include/net/irda/irlan_event.h rename to drivers/staging/irda/include/net/irda/irlan_event.h diff --git a/include/net/irda/irlan_filter.h b/drivers/staging/irda/include/net/irda/irlan_filter.h similarity index 100% rename from include/net/irda/irlan_filter.h rename to drivers/staging/irda/include/net/irda/irlan_filter.h diff --git a/include/net/irda/irlan_provider.h b/drivers/staging/irda/include/net/irda/irlan_provider.h similarity index 100% rename from include/net/irda/irlan_provider.h rename to drivers/staging/irda/include/net/irda/irlan_provider.h diff --git a/include/net/irda/irlap.h b/drivers/staging/irda/include/net/irda/irlap.h similarity index 100% rename from include/net/irda/irlap.h rename to drivers/staging/irda/include/net/irda/irlap.h diff --git a/include/net/irda/irlap_event.h b/drivers/staging/irda/include/net/irda/irlap_event.h similarity index 100% rename from include/net/irda/irlap_event.h rename to drivers/staging/irda/include/net/irda/irlap_event.h diff --git a/include/net/irda/irlap_frame.h b/drivers/staging/irda/include/net/irda/irlap_frame.h similarity index 100% rename from include/net/irda/irlap_frame.h rename to drivers/staging/irda/include/net/irda/irlap_frame.h diff --git a/include/net/irda/irlmp.h b/drivers/staging/irda/include/net/irda/irlmp.h similarity index 100% rename from include/net/irda/irlmp.h rename to drivers/staging/irda/include/net/irda/irlmp.h diff --git a/include/net/irda/irlmp_event.h b/drivers/staging/irda/include/net/irda/irlmp_event.h similarity index 100% rename from include/net/irda/irlmp_event.h rename to drivers/staging/irda/include/net/irda/irlmp_event.h diff --git a/include/net/irda/irlmp_frame.h b/drivers/staging/irda/include/net/irda/irlmp_frame.h similarity index 100% rename from include/net/irda/irlmp_frame.h rename to drivers/staging/irda/include/net/irda/irlmp_frame.h diff --git a/include/net/irda/irmod.h b/drivers/staging/irda/include/net/irda/irmod.h similarity index 100% rename from include/net/irda/irmod.h rename to drivers/staging/irda/include/net/irda/irmod.h diff --git a/include/net/irda/irqueue.h b/drivers/staging/irda/include/net/irda/irqueue.h similarity index 100% rename from include/net/irda/irqueue.h rename to drivers/staging/irda/include/net/irda/irqueue.h diff --git a/include/net/irda/irttp.h b/drivers/staging/irda/include/net/irda/irttp.h similarity index 100% rename from include/net/irda/irttp.h rename to drivers/staging/irda/include/net/irda/irttp.h diff --git a/include/net/irda/parameters.h b/drivers/staging/irda/include/net/irda/parameters.h similarity index 100% rename from include/net/irda/parameters.h rename to drivers/staging/irda/include/net/irda/parameters.h diff --git a/include/net/irda/qos.h b/drivers/staging/irda/include/net/irda/qos.h similarity index 100% rename from include/net/irda/qos.h rename to drivers/staging/irda/include/net/irda/qos.h diff --git a/include/net/irda/timer.h b/drivers/staging/irda/include/net/irda/timer.h similarity index 100% rename from include/net/irda/timer.h rename to drivers/staging/irda/include/net/irda/timer.h diff --git a/include/net/irda/wrapper.h b/drivers/staging/irda/include/net/irda/wrapper.h similarity index 100% rename from include/net/irda/wrapper.h rename to drivers/staging/irda/include/net/irda/wrapper.h diff --git a/drivers/staging/irda/net/Makefile b/drivers/staging/irda/net/Makefile index 187f6c563a4b..bd1a635b88cf 100644 --- a/drivers/staging/irda/net/Makefile +++ b/drivers/staging/irda/net/Makefile @@ -2,6 +2,8 @@ # Makefile for the Linux IrDA protocol layer. # +subdir-ccflags-y += -I$(srctree)/drivers/staging/irda/include + obj-$(CONFIG_IRDA) += irda.o obj-$(CONFIG_IRLAN) += irlan/ obj-$(CONFIG_IRNET) += irnet/ From 333b3d070f703c1c433ed04d7e9458f60cec4dc2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 27 Aug 2017 17:03:34 +0200 Subject: [PATCH 4/4] staging: irda: add a TODO file. The irda code will be deleted in a future kernel release, so no need to have anyone do any new work on it. Signed-off-by: Greg Kroah-Hartman Signed-off-by: David S. Miller --- drivers/staging/irda/TODO | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 drivers/staging/irda/TODO diff --git a/drivers/staging/irda/TODO b/drivers/staging/irda/TODO new file mode 100644 index 000000000000..7d98a5cffaff --- /dev/null +++ b/drivers/staging/irda/TODO @@ -0,0 +1,4 @@ +The irda code will be removed soon from the kernel tree as it is old and +obsolete and broken. + +Don't worry about fixing up anything here, it's not needed.