The IRDA code has long been obsolete and broken. So, to keep people
from trying to use it, and to prevent people from having to maintain it,
let's move it to drivers/staging/ so that we can delete it entirely from
the kernel in a few releases.
Greg Kroah-Hartman (4):
irda: move net/irda/ to drivers/staging/irda/net/
irda: move drivers/net/irda to drivers/staging/irda/drivers
irda: move include/net/irda into staging subdirectory
staging: irda: add a TODO file.
drivers/net/Makefile | 1 -
drivers/staging/Kconfig | 2 ++
drivers/staging/Makefile | 2 ++
drivers/staging/irda/TODO | 4 ++++
drivers/{net/irda => staging/irda/drivers}/Kconfig | 0
drivers/{net/irda => staging/irda/drivers}/Makefile | 2 ++
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
{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
{include => drivers/staging/irda/include}/net/irda/ircomm_core.h | 0
{include => drivers/staging/irda/include}/net/irda/ircomm_event.h | 0
{include => drivers/staging/irda/include}/net/irda/ircomm_lmp.h | 0
{include => drivers/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
{include => drivers/staging/irda/include}/net/irda/irda_device.h | 0
{include => drivers/staging/irda/include}/net/irda/iriap.h | 0
{include => drivers/staging/irda/include}/net/irda/iriap_event.h | 0
{include => drivers/staging/irda/include}/net/irda/irias_object.h | 0
{include => drivers/staging/irda/include}/net/irda/irlan_client.h | 0
{include => drivers/staging/irda/include}/net/irda/irlan_common.h | 0
{include => drivers/staging/irda/include}/net/irda/irlan_eth.h | 0
{include => drivers/staging/irda/include}/net/irda/irlan_event.h | 0
{include => drivers/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
{include => drivers/staging/irda/include}/net/irda/irlap_event.h | 0
{include => drivers/staging/irda/include}/net/irda/irlap_frame.h | 0
{include => drivers/staging/irda/include}/net/irda/irlmp.h | 0
{include => drivers/staging/irda/include}/net/irda/irlmp_event.h | 0
{include => drivers/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
{net/irda => drivers/staging/irda/net}/Kconfig | 8 ++++----
{net/irda => drivers/staging/irda/net}/Makefile | 2 ++
{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
{net/irda => drivers/staging/irda/net}/ircomm/ircomm_event.c | 0
{net/irda => drivers/staging/irda/net}/ircomm/ircomm_lmp.c | 0
{net/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
{net/irda => drivers/staging/irda/net}/ircomm/ircomm_tty_attach.c | 0
{net/irda => drivers/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
{net/irda => drivers/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
{net/irda => drivers/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 -
138 files changed, 16 insertions(+), 7 deletions(-)
create mode 100644 drivers/staging/irda/TODO
rename drivers/{net/irda => staging/irda/drivers}/Kconfig (100%)
rename drivers/{net/irda => staging/irda/drivers}/Makefile (96%)
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%)
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%)
rename {net/irda => drivers/staging/irda/net}/Kconfig (94%)
rename {net/irda => drivers/staging/irda/net}/Makefile (88%)
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%)
--
2.14.1
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 <[email protected]>
---
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
{net/irda => drivers/staging/irda/net}/ircomm/ircomm_event.c | 0
{net/irda => drivers/staging/irda/net}/ircomm/ircomm_lmp.c | 0
{net/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
{net/irda => drivers/staging/irda/net}/ircomm/ircomm_tty_attach.c | 0
{net/irda => drivers/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
{net/irda => drivers/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
{net/irda => drivers/staging/irda/net}/irlan/irlan_provider.c | 0
{net/irda => drivers/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 7d57ef34b79c..992a5b8f72d7 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -364,7 +364,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/
--
2.14.1
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 <[email protected]>
---
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"
--
2.14.1
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 <[email protected]>
---
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.
--
2.14.1
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 <[email protected]>
---
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
{include => drivers/staging/irda/include}/net/irda/ircomm_core.h | 0
{include => drivers/staging/irda/include}/net/irda/ircomm_event.h | 0
{include => drivers/staging/irda/include}/net/irda/ircomm_lmp.h | 0
{include => drivers/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
{include => drivers/staging/irda/include}/net/irda/ircomm_tty_attach.h | 0
{include => drivers/staging/irda/include}/net/irda/irda.h | 0
{include => drivers/staging/irda/include}/net/irda/irda_device.h | 0
{include => drivers/staging/irda/include}/net/irda/iriap.h | 0
{include => drivers/staging/irda/include}/net/irda/iriap_event.h | 0
{include => drivers/staging/irda/include}/net/irda/irias_object.h | 0
{include => drivers/staging/irda/include}/net/irda/irlan_client.h | 0
{include => drivers/staging/irda/include}/net/irda/irlan_common.h | 0
{include => drivers/staging/irda/include}/net/irda/irlan_eth.h | 0
{include => drivers/staging/irda/include}/net/irda/irlan_event.h | 0
{include => drivers/staging/irda/include}/net/irda/irlan_filter.h | 0
{include => drivers/staging/irda/include}/net/irda/irlan_provider.h | 0
{include => drivers/staging/irda/include}/net/irda/irlap.h | 0
{include => drivers/staging/irda/include}/net/irda/irlap_event.h | 0
{include => drivers/staging/irda/include}/net/irda/irlap_frame.h | 0
{include => drivers/staging/irda/include}/net/irda/irlmp.h | 0
{include => drivers/staging/irda/include}/net/irda/irlmp_event.h | 0
{include => drivers/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/
--
2.14.1
On Sun, 2017-08-27 at 17:03 +0200, Greg Kroah-Hartman wrote:
> The IRDA code has long been obsolete and broken. So, to keep people
> from trying to use it, and to prevent people from having to maintain it,
> let's move it to drivers/staging/ so that we can delete it entirely from
> the kernel in a few releases.
MAINTAINERS should be updated as well.
It'd probably be nice to try to get an email to
the irda mailing list too if it still works.
On Sun, Aug 27, 2017 at 08:35:43AM -0700, Joe Perches wrote:
> On Sun, 2017-08-27 at 17:03 +0200, Greg Kroah-Hartman wrote:
> > The IRDA code has long been obsolete and broken. So, to keep people
> > from trying to use it, and to prevent people from having to maintain it,
> > let's move it to drivers/staging/ so that we can delete it entirely from
> > the kernel in a few releases.
>
> MAINTAINERS should be updated as well.
>
> It'd probably be nice to try to get an email to
> the irda mailing list too if it still works.
As get_maintainer.pl didn't show it, odds are it doesn't...
On Sun, 2017-08-27 at 18:13 +0200, Greg Kroah-Hartman wrote:
> On Sun, Aug 27, 2017 at 08:35:43AM -0700, Joe Perches wrote:
> > On Sun, 2017-08-27 at 17:03 +0200, Greg Kroah-Hartman wrote:
> > > The IRDA code has long been obsolete and broken. So, to keep people
> > > from trying to use it, and to prevent people from having to maintain it,
> > > let's move it to drivers/staging/ so that we can delete it entirely from
> > > the kernel in a few releases.
> >
> >
> > MAINTAINERS should be updated as well.
> >
> > It'd probably be nice to try to get an email to
> > the irda mailing list too if it still works.
>
> As get_maintainer.pl didn't show it, odds are it doesn't...
get_maintainer doesn't show it because it's subscriber-only.
If you want get_maintainer to show it, add -s
$ ./scripts/get_maintainer.pl??-s -f net/irda/
Samuel Ortiz <[email protected]> (maintainer:IRDA SUBSYSTEM)
"David S. Miller" <[email protected]> (maintainer:NETWORKING [GENERAL])
[email protected] (subscriber list:IRDA SUBSYSTEM)
[email protected] (open list:IRDA SUBSYSTEM)
[email protected] (open list)
On Sun, Aug 27, 2017 at 09:19:19AM -0700, Joe Perches wrote:
> On Sun, 2017-08-27 at 18:13 +0200, Greg Kroah-Hartman wrote:
> > On Sun, Aug 27, 2017 at 08:35:43AM -0700, Joe Perches wrote:
> > > On Sun, 2017-08-27 at 17:03 +0200, Greg Kroah-Hartman wrote:
> > > > The IRDA code has long been obsolete and broken. So, to keep people
> > > > from trying to use it, and to prevent people from having to maintain it,
> > > > let's move it to drivers/staging/ so that we can delete it entirely from
> > > > the kernel in a few releases.
> > >
> > >
> > > MAINTAINERS should be updated as well.
> > >
> > > It'd probably be nice to try to get an email to
> > > the irda mailing list too if it still works.
> >
> > As get_maintainer.pl didn't show it, odds are it doesn't...
>
> get_maintainer doesn't show it because it's subscriber-only.
> If you want get_maintainer to show it, add -s
>
> $ ./scripts/get_maintainer.pl??-s -f net/irda/
> Samuel Ortiz <[email protected]> (maintainer:IRDA SUBSYSTEM)
> "David S. Miller" <[email protected]> (maintainer:NETWORKING [GENERAL])
> [email protected] (subscriber list:IRDA SUBSYSTEM)
> [email protected] (open list:IRDA SUBSYSTEM)
> [email protected] (open list)
Sorry, am not going to subscribe to a random list just to send patches
that delete the subsystem :)
netdev@ should be all that is needed here anyway...
thanks,
greg k-h
On Sun, 2017-08-27 at 18:53 +0200, Greg Kroah-Hartman wrote:
> On Sun, Aug 27, 2017 at 09:19:19AM -0700, Joe Perches wrote:
> > On Sun, 2017-08-27 at 18:13 +0200, Greg Kroah-Hartman wrote:
> > > On Sun, Aug 27, 2017 at 08:35:43AM -0700, Joe Perches wrote:
> > > > On Sun, 2017-08-27 at 17:03 +0200, Greg Kroah-Hartman wrote:
> > > > > The IRDA code has long been obsolete and broken. So, to keep people
> > > > > from trying to use it, and to prevent people from having to maintain it,
> > > > > let's move it to drivers/staging/ so that we can delete it entirely from
> > > > > the kernel in a few releases.
> > > >
> > > >
> > > > MAINTAINERS should be updated as well.
> > > >
> > > > It'd probably be nice to try to get an email to
> > > > the irda mailing list too if it still works.
> > >
> > > As get_maintainer.pl didn't show it, odds are it doesn't...
> >
> > get_maintainer doesn't show it because it's subscriber-only.
> > If you want get_maintainer to show it, add -s
> >
> > $ ./scripts/get_maintainer.pl??-s -f net/irda/
> > Samuel Ortiz <[email protected]> (maintainer:IRDA SUBSYSTEM)
> > "David S. Miller" <[email protected]> (maintainer:NETWORKING [GENERAL])
> > [email protected] (subscriber list:IRDA SUBSYSTEM)
> > [email protected] (open list:IRDA SUBSYSTEM)
> > [email protected] (open list)
>
> Sorry, am not going to subscribe to a random list just to send patches
> that delete the subsystem :)
Then you do a disservice to those that actually might
be using that subsystem.
From: Greg Kroah-Hartman <[email protected]>
Date: Sun, 27 Aug 2017 17:03:30 +0200
> The IRDA code has long been obsolete and broken. So, to keep people
> from trying to use it, and to prevent people from having to maintain it,
> let's move it to drivers/staging/ so that we can delete it entirely from
> the kernel in a few releases.
No objection, I'll apply this to net-next, thanks Greg.
On Mon, 2017-08-28 at 16:42 -0700, David Miller wrote:
> From: Greg Kroah-Hartman <[email protected]>
> Date: Sun, 27 Aug 2017 17:03:30 +0200
>
> > The IRDA code has long been obsolete and broken.? So, to keep people
> > from trying to use it, and to prevent people from having to maintain it,
> > let's move it to drivers/staging/ so that we can delete it entirely from
> > the kernel in a few releases.
>
> No objection, I'll apply this to net-next, thanks Greg.
Still needs an update to MAINTAINERS.
On Mon, Aug 28, 2017 at 04:46:07PM -0700, Joe Perches wrote:
> On Mon, 2017-08-28 at 16:42 -0700, David Miller wrote:
> > From: Greg Kroah-Hartman <[email protected]>
> > Date: Sun, 27 Aug 2017 17:03:30 +0200
> >
> > > The IRDA code has long been obsolete and broken.? So, to keep people
> > > from trying to use it, and to prevent people from having to maintain it,
> > > let's move it to drivers/staging/ so that we can delete it entirely from
> > > the kernel in a few releases.
> >
> > No objection, I'll apply this to net-next, thanks Greg.
>
> Still needs an update to MAINTAINERS.
Oops, forgot those directories, will send a follow-on patch for that.
greg k-h
On Tue, Aug 29, 2017 at 02:11:39PM +0200, Geert Uytterhoeven wrote:
> Hi Greg,
>
> On Tue, Aug 29, 2017 at 1:28 PM, Greg Kroah-Hartman
> <[email protected]> wrote:
> > On Tue, Aug 29, 2017 at 01:11:31PM +0200, Stefano Brivio wrote:
> >> On Tue, 29 Aug 2017 12:59:00 +0200
> >> Geert Uytterhoeven <[email protected]> wrote:
> >> > On Sun, Aug 27, 2017 at 5:03 PM, Greg Kroah-Hartman
> >> > <[email protected]> wrote:
> >> > > The IRDA code has long been obsolete and broken. So, to keep people
> >> > > from trying to use it, and to prevent people from having to maintain it,
> >> > > let's move it to drivers/staging/ so that we can delete it entirely from
> >> > > the kernel in a few releases.
> >> >
> >> > (diving into an early boot crash)
> >> >
> >> > Have you tried running this? ;-)
> >> >
> >> > irda_init() and net_dev_init() are both subsys_initcall()s.
> >> > But the former now runs before the latter, leading to:
> >> >
> >> > Unable to handle kernel NULL pointer dereference at virtual address 00000004
> >>
> >> Should be fixed by https://patchwork.ozlabs.org/patch/807006/
> >> ("[net-next] staging: irda: force to be a kernel module") I guess...
> >
> > Yup, that's the fix for this issue.
> >
> > Geert, does that fix the problem for you?
>
> Thanks, that patch fixes the crash, obviously.
>
> It does mean you can no longer have IrDA in a non-modular kernel.
Given that irda doesn't really work, I doubt anyone is going to care
about it :)
thanks,
greg k-h
Hi Greg,
On Tue, Aug 29, 2017 at 1:28 PM, Greg Kroah-Hartman
<[email protected]> wrote:
> On Tue, Aug 29, 2017 at 01:11:31PM +0200, Stefano Brivio wrote:
>> On Tue, 29 Aug 2017 12:59:00 +0200
>> Geert Uytterhoeven <[email protected]> wrote:
>> > On Sun, Aug 27, 2017 at 5:03 PM, Greg Kroah-Hartman
>> > <[email protected]> wrote:
>> > > The IRDA code has long been obsolete and broken. So, to keep people
>> > > from trying to use it, and to prevent people from having to maintain it,
>> > > let's move it to drivers/staging/ so that we can delete it entirely from
>> > > the kernel in a few releases.
>> >
>> > (diving into an early boot crash)
>> >
>> > Have you tried running this? ;-)
>> >
>> > irda_init() and net_dev_init() are both subsys_initcall()s.
>> > But the former now runs before the latter, leading to:
>> >
>> > Unable to handle kernel NULL pointer dereference at virtual address 00000004
>>
>> Should be fixed by https://patchwork.ozlabs.org/patch/807006/
>> ("[net-next] staging: irda: force to be a kernel module") I guess...
>
> Yup, that's the fix for this issue.
>
> Geert, does that fix the problem for you?
Thanks, that patch fixes the crash, obviously.
It does mean you can no longer have IrDA in a non-modular kernel.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Hi Greg,
On Sun, Aug 27, 2017 at 5:03 PM, Greg Kroah-Hartman
<[email protected]> wrote:
> The IRDA code has long been obsolete and broken. So, to keep people
> from trying to use it, and to prevent people from having to maintain it,
> let's move it to drivers/staging/ so that we can delete it entirely from
> the kernel in a few releases.
(diving into an early boot crash)
Have you tried running this? ;-)
irda_init() and net_dev_init() are both subsys_initcall()s.
But the former now runs before the latter, leading to:
Unable to handle kernel NULL pointer dereference at virtual address 00000004
pgd = c0004000
[00000004] *pgd=00000000
Internal error: Oops: 5 [#1] SMP ARM
Modules linked in:
CPU: 1 PID: 1 Comm: swapper/0 Not tainted
4.13.0-rc7-kzm9g-05769-g46efec19d1294ece-dirty #954
Hardware name: Generic SH73A0 (Flattened Device Tree)
task: df440040 task.stack: df442000
PC is at __list_add_valid+0x8/0x74
LR is at 0x0
pc : [<c03223ec>] lr : [<00000000>] psr: 60000013
sp : df443ef0 ip : df440630 fp : 00000000
r10: c0828858 r9 : c0937000 r8 : 00000000
r7 : c0908034 r6 : 00000000 r5 : c0908020 r4 : c090862c
r3 : df440040 r2 : 00000000 r1 : c090862c r0 : c0908034
Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none
Control: 10c5387d Table: 4000404a DAC: 00000051
Process swapper/0 (pid: 1, stack limit = 0xdf442210)
Stack: (0xdf443ef0 to 0xdf444000)
3ee0: c090862c c0489ea8 00000000 00000000
3f00: c081c274 00000093 c0836418 c081c2a0 00000004 c0101878 00000000 c0790758
3f20: 00000000 c013fec0 00000001 c078fbf0 00000004 00000004 c079076c dfffce3f
3f40: 00000092 c079076c dfffce3f dfffce47 c0910af0 00000004 c0828844 00000093
3f60: 00000004 c0828848 00000093 c0836418 c0937000 c0800d28 00000004 00000004
3f80: 00000000 c08005b0 00000000 c055cf7c 00000000 00000000 00000000 00000000
3fa0: 00000000 c055cf84 00000000 c0106f90 00000000 00000000 00000000 00000000
3fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
3fe0: 00000000 00000000 00000000 00000000 00000013 00000000 7fdfffff fff7fdff
[<c03223ec>] (__list_add_valid) from [<c0489ea8>] (dev_add_pack+0x70/0xac)
[<c0489ea8>] (dev_add_pack) from [<c081c2a0>] (irda_init+0x2c/0x84)
[<c081c2a0>] (irda_init) from [<c0101878>] (do_one_initcall+0xa8/0x150)
[<c0101878>] (do_one_initcall) from [<c0800d28>]
(kernel_init_freeable+0x114/0x1d4)
[<c0800d28>] (kernel_init_freeable) from [<c055cf84>] (kernel_init+0x8/0x110)
[<c055cf84>] (kernel_init) from [<c0106f90>] (ret_from_fork+0x14/0x24)
DIsabling CONFIG_IRDA (apparently I wasn't using it anyway), and
continuing my life...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
On Tue, 29 Aug 2017 12:59:00 +0200
Geert Uytterhoeven <[email protected]> wrote:
> Hi Greg,
>
> On Sun, Aug 27, 2017 at 5:03 PM, Greg Kroah-Hartman
> <[email protected]> wrote:
> > The IRDA code has long been obsolete and broken. So, to keep people
> > from trying to use it, and to prevent people from having to maintain it,
> > let's move it to drivers/staging/ so that we can delete it entirely from
> > the kernel in a few releases.
>
> (diving into an early boot crash)
>
> Have you tried running this? ;-)
>
> irda_init() and net_dev_init() are both subsys_initcall()s.
> But the former now runs before the latter, leading to:
>
> Unable to handle kernel NULL pointer dereference at virtual address 00000004
Should be fixed by https://patchwork.ozlabs.org/patch/807006/
("[net-next] staging: irda: force to be a kernel module") I guess...
--
Stefano
On Tue, Aug 29, 2017 at 01:11:31PM +0200, Stefano Brivio wrote:
> On Tue, 29 Aug 2017 12:59:00 +0200
> Geert Uytterhoeven <[email protected]> wrote:
>
> > Hi Greg,
> >
> > On Sun, Aug 27, 2017 at 5:03 PM, Greg Kroah-Hartman
> > <[email protected]> wrote:
> > > The IRDA code has long been obsolete and broken. So, to keep people
> > > from trying to use it, and to prevent people from having to maintain it,
> > > let's move it to drivers/staging/ so that we can delete it entirely from
> > > the kernel in a few releases.
> >
> > (diving into an early boot crash)
> >
> > Have you tried running this? ;-)
> >
> > irda_init() and net_dev_init() are both subsys_initcall()s.
> > But the former now runs before the latter, leading to:
> >
> > Unable to handle kernel NULL pointer dereference at virtual address 00000004
>
> Should be fixed by https://patchwork.ozlabs.org/patch/807006/
> ("[net-next] staging: irda: force to be a kernel module") I guess...
Yup, that's the fix for this issue.
Geert, does that fix the problem for you?
thanks,
greg k-h
From: Geert Uytterhoeven <[email protected]>
Date: Tue, 29 Aug 2017 12:59:00 +0200
> Hi Greg,
>
> On Sun, Aug 27, 2017 at 5:03 PM, Greg Kroah-Hartman
> <[email protected]> wrote:
>> The IRDA code has long been obsolete and broken. So, to keep people
>> from trying to use it, and to prevent people from having to maintain it,
>> let's move it to drivers/staging/ so that we can delete it entirely from
>> the kernel in a few releases.
>
> (diving into an early boot crash)
>
> Have you tried running this? ;-)
>
> irda_init() and net_dev_init() are both subsys_initcall()s.
> But the former now runs before the latter, leading to:
We must find a way to make the ordering proper again when both are
built-in.
From: Greg Kroah-Hartman <[email protected]>
Date: Tue, 29 Aug 2017 16:48:50 +0200
> On Tue, Aug 29, 2017 at 02:11:39PM +0200, Geert Uytterhoeven wrote:
>> Hi Greg,
>>
>> On Tue, Aug 29, 2017 at 1:28 PM, Greg Kroah-Hartman
>> <[email protected]> wrote:
>> > On Tue, Aug 29, 2017 at 01:11:31PM +0200, Stefano Brivio wrote:
>> >> On Tue, 29 Aug 2017 12:59:00 +0200
>> >> Geert Uytterhoeven <[email protected]> wrote:
>> >> > On Sun, Aug 27, 2017 at 5:03 PM, Greg Kroah-Hartman
>> >> > <[email protected]> wrote:
>> >> > > The IRDA code has long been obsolete and broken. So, to keep people
>> >> > > from trying to use it, and to prevent people from having to maintain it,
>> >> > > let's move it to drivers/staging/ so that we can delete it entirely from
>> >> > > the kernel in a few releases.
>> >> >
>> >> > (diving into an early boot crash)
>> >> >
>> >> > Have you tried running this? ;-)
>> >> >
>> >> > irda_init() and net_dev_init() are both subsys_initcall()s.
>> >> > But the former now runs before the latter, leading to:
>> >> >
>> >> > Unable to handle kernel NULL pointer dereference at virtual address 00000004
>> >>
>> >> Should be fixed by https://patchwork.ozlabs.org/patch/807006/
>> >> ("[net-next] staging: irda: force to be a kernel module") I guess...
>> >
>> > Yup, that's the fix for this issue.
>> >
>> > Geert, does that fix the problem for you?
>>
>> Thanks, that patch fixes the crash, obviously.
>>
>> It does mean you can no longer have IrDA in a non-modular kernel.
>
> Given that irda doesn't really work, I doubt anyone is going to care
> about it :)
The initialization with everything built-in worked fine before your
changes.
On Tuesday 29 August 2017 01:42:08 David Miller wrote:
> From: Greg Kroah-Hartman <[email protected]>
> Date: Sun, 27 Aug 2017 17:03:30 +0200
>
> > The IRDA code has long been obsolete and broken. So, to keep people
> > from trying to use it, and to prevent people from having to maintain it,
> > let's move it to drivers/staging/ so that we can delete it entirely from
> > the kernel in a few releases.
>
> No objection, I'll apply this to net-next, thanks Greg.
IRDA works fine in Debian 9 (kernel 4.9) and I use it for simple file
transfer. Hope I'm not the only one...
# irattach /dev/ttyS0 -d tekram -s
# irdadump
21:28:52.830350 xid:cmd aed8eb79 > ffffffff S=6 s=0 (14)
21:28:52.922368 xid:cmd aed8eb79 > ffffffff S=6 s=1 (14)
21:28:53.014350 xid:cmd aed8eb79 > ffffffff S=6 s=2 (14)
21:28:53.106338 xid:cmd aed8eb79 > ffffffff S=6 s=3 (14)
21:28:53.190276 xid:rsp aed8eb79 < 000035d1 S=6 s=3 Nokia 6230i hint=b125 [
PnP Modem Fax Telephony IrCOMM IrOBEX ] (28)
21:28:53.198384 xid:cmd aed8eb79 > ffffffff S=6 s=4 (14)
21:28:53.290382 xid:cmd aed8eb79 > ffffffff S=6 s=5 (14)
21:28:53.382341 xid:cmd aed8eb79 > ffffffff S=6 s=* pentium hint=0400 [
Computer ] (23)
^C
8 packets received by filter
$ obexftp -i -l MMC
Connecting..\done
Receiving "MMC".../<?xml version="1.0"?>
<!DOCTYPE folder-listing SYSTEM "obex-folder-listing.dtd"
[ <!ATTLIST folder mem-type CDATA #IMPLIED> ]>
<folder-listing version="1.0">
<parent-folder />
<file name="Image000.jpg" size="304300" modified="20160219T135924"
user-perm="RWD"/>
<file name="Image001.jpg" size="270037" modified="20170811T233122"
user-perm="RWD"/>
<file name="Image004.jpg" size="53519" modified="20170814T074550"
user-perm="RWD"/>
....
$ obexftp -i -c MMC -g Image004.jpg
Connecting..\done
Sending "MMC"...|done
Receiving "Image004.jpg"...-done
Disconnecting..\done
--
Ondrej Zary
FYI, we noticed the following commit:
commit: 66d98e78e44ccb969cb3196995759d200e64b49b ("irda: move net/irda/ to drivers/staging/irda/net/")
url: https://github.com/0day-ci/linux/commits/Greg-Kroah-Hartman/irda-move-it-to-drivers-staging-so-we-can-delete-it/20170829-090816
in testcase: trinity
with following parameters:
runtime: 300s
test-description: Trinity is a linux system call fuzz tester.
test-url: http://codemonkey.org.uk/projects/trinity/
on test machine: qemu-system-i386 -enable-kvm -smp 2 -m 320M
caused below changes (please refer to attached dmesg/kmsg for entire log/backtrace):
+-----------------------------------------------------+------------+------------+
| | 89ff9d58e6 | 66d98e78e4 |
+-----------------------------------------------------+------------+------------+
| boot_successes | 0 | 0 |
| boot_failures | 10 | 12 |
| IP-Config:Auto-configuration_of_network_failed | 8 | |
| WARNING:at_arch/x86/mm/dump_pagetables.c:#note_page | 2 | |
| EIP:note_page | 2 | |
| BUG:unable_to_handle_kernel | 0 | 12 |
| Oops:#[##] | 0 | 12 |
| EIP:dev_add_pack | 0 | 12 |
| Kernel_panic-not_syncing:Fatal_exception | 0 | 12 |
+-----------------------------------------------------+------------+------------+
[ 0.227015] BUG: unable to handle kernel NULL pointer dereference at 00000004
[ 0.228000] IP: dev_add_pack+0x37/0x80
[ 0.228000] *pdpt = 0000000000000000 *pde = f000ff53f000ff53
[ 0.228000]
[ 0.228000] Oops: 0002 [#1] SMP
[ 0.228000] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.13.0-rc5-00526-g66d98e7 #60
[ 0.228000] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.9.3-20161025_171302-gandalf 04/01/2014
[ 0.228000] task: d3042040 task.stack: d3044000
[ 0.228000] EIP: dev_add_pack+0x37/0x80
[ 0.228000] EFLAGS: 00210286 CPU: 0
[ 0.228000] EAX: 00000000 EBX: c20c9318 ECX: d30424c8 EDX: c20c8c60
[ 0.228000] ESI: c20c8c4c EDI: 00000000 EBP: d3045f18 ESP: d3045f10
[ 0.228000] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
[ 0.228000] CR0: 80050033 CR2: 00000004 CR3: 022f4000 CR4: 000006b0
[ 0.228000] Call Trace:
[ 0.228000] ? irda_nl_register+0xf/0xf
[ 0.228000] irda_init+0x30/0x88
[ 0.228000] do_one_initcall+0x8b/0x131
[ 0.228000] kernel_init_freeable+0xee/0x166
[ 0.228000] ? rest_init+0x120/0x120
[ 0.228000] kernel_init+0xb/0x100
[ 0.228000] ? schedule_tail_wrapper+0x9/0xc
[ 0.228000] ret_from_fork+0x19/0x24
[ 0.228000] Code: 03 00 00 74 3f 8b 5e 04 85 db 74 50 83 c3 5c b8 e0 6a 09 c2 e8 ab 69 20 00 8b 03 8d 56 14 89 5e 18 89 46 14 0f ae f0 89 f6 89 13 <89> 50 04 b8 e0 6a 09 c2 e8 cc 6d 20 00 5b 5e 5d c3 90 8d b4 26
[ 0.228000] EIP: dev_add_pack+0x37/0x80 SS:ESP: 0068:d3045f10
[ 0.228000] CR2: 0000000000000004
[ 0.228000] ---[ end trace 593bc6d2366a532d ]---
To reproduce:
git clone https://github.com/01org/lkp-tests.git
cd lkp-tests
bin/lkp qemu -k <bzImage> job-script # job-script is attached in this email
Thanks,
Xiaolong
On Wed, Aug 30, 2017 at 02:04:11PM +0800, kernel test robot wrote:
> FYI, we noticed the following commit:
>
> commit: 66d98e78e44ccb969cb3196995759d200e64b49b ("irda: move net/irda/ to drivers/staging/irda/net/")
> url: https://github.com/0day-ci/linux/commits/Greg-Kroah-Hartman/irda-move-it-to-drivers-staging-so-we-can-delete-it/20170829-090816
>
> in testcase: trinity
> with following parameters:
>
> runtime: 300s
>
> test-description: Trinity is a linux system call fuzz tester.
> test-url: http://codemonkey.org.uk/projects/trinity/
>
> on test machine: qemu-system-i386 -enable-kvm -smp 2 -m 320M
>
> caused below changes (please refer to attached dmesg/kmsg for entire log/backtrace):
>
> +-----------------------------------------------------+------------+------------+
> | | 89ff9d58e6 | 66d98e78e4 |
> +-----------------------------------------------------+------------+------------+
> | boot_successes | 0 | 0 |
> | boot_failures | 10 | 12 |
> | IP-Config:Auto-configuration_of_network_failed | 8 | |
> | WARNING:at_arch/x86/mm/dump_pagetables.c:#note_page | 2 | |
> | EIP:note_page | 2 | |
> | BUG:unable_to_handle_kernel | 0 | 12 |
> | Oops:#[##] | 0 | 12 |
> | EIP:dev_add_pack | 0 | 12 |
> | Kernel_panic-not_syncing:Fatal_exception | 0 | 12 |
> +-----------------------------------------------------+------------+------------+
>
> [ 0.227015] BUG: unable to handle kernel NULL pointer dereference at 00000004
> [ 0.228000] IP: dev_add_pack+0x37/0x80
Didn't you report this yesterday as well? Anyway, am working on it,
give me a few hours to wake up and test...
thanks,
greg k-h
On 08/30, Greg Kroah-Hartman wrote:
>On Wed, Aug 30, 2017 at 02:04:11PM +0800, kernel test robot wrote:
>> FYI, we noticed the following commit:
>>
>> commit: 66d98e78e44ccb969cb3196995759d200e64b49b ("irda: move net/irda/ to drivers/staging/irda/net/")
>> url: https://github.com/0day-ci/linux/commits/Greg-Kroah-Hartman/irda-move-it-to-drivers-staging-so-we-can-delete-it/20170829-090816
>>
>> in testcase: trinity
>> with following parameters:
>>
>> runtime: 300s
>>
>> test-description: Trinity is a linux system call fuzz tester.
>> test-url: http://codemonkey.org.uk/projects/trinity/
>>
>> on test machine: qemu-system-i386 -enable-kvm -smp 2 -m 320M
>>
>> caused below changes (please refer to attached dmesg/kmsg for entire log/backtrace):
>>
>> +-----------------------------------------------------+------------+------------+
>> | | 89ff9d58e6 | 66d98e78e4 |
>> +-----------------------------------------------------+------------+------------+
>> | boot_successes | 0 | 0 |
>> | boot_failures | 10 | 12 |
>> | IP-Config:Auto-configuration_of_network_failed | 8 | |
>> | WARNING:at_arch/x86/mm/dump_pagetables.c:#note_page | 2 | |
>> | EIP:note_page | 2 | |
>> | BUG:unable_to_handle_kernel | 0 | 12 |
>> | Oops:#[##] | 0 | 12 |
>> | EIP:dev_add_pack | 0 | 12 |
>> | Kernel_panic-not_syncing:Fatal_exception | 0 | 12 |
>> +-----------------------------------------------------+------------+------------+
>>
>> [ 0.227015] BUG: unable to handle kernel NULL pointer dereference at 00000004
>> [ 0.228000] IP: dev_add_pack+0x37/0x80
>
>Didn't you report this yesterday as well? Anyway, am working on it,
>give me a few hours to wake up and test...
Hi,
0day bot tested both the lkml patch and the commit in dev-queue branch of
next-queue.git tree, hence the duplicated report.
Thanks,
Xiaolong
>
>thanks,
>
>greg k-h
On Tue, Aug 29, 2017 at 11:32:58PM +0200, Ondrej Zary wrote:
> On Tuesday 29 August 2017 01:42:08 David Miller wrote:
> > From: Greg Kroah-Hartman <[email protected]>
> > Date: Sun, 27 Aug 2017 17:03:30 +0200
> >
> > > The IRDA code has long been obsolete and broken. So, to keep people
> > > from trying to use it, and to prevent people from having to maintain it,
> > > let's move it to drivers/staging/ so that we can delete it entirely from
> > > the kernel in a few releases.
> >
> > No objection, I'll apply this to net-next, thanks Greg.
>
> IRDA works fine in Debian 9 (kernel 4.9) and I use it for simple file
> transfer. Hope I'm not the only one...
>
> # irattach /dev/ttyS0 -d tekram -s
> # irdadump
> 21:28:52.830350 xid:cmd aed8eb79 > ffffffff S=6 s=0 (14)
> 21:28:52.922368 xid:cmd aed8eb79 > ffffffff S=6 s=1 (14)
> 21:28:53.014350 xid:cmd aed8eb79 > ffffffff S=6 s=2 (14)
> 21:28:53.106338 xid:cmd aed8eb79 > ffffffff S=6 s=3 (14)
> 21:28:53.190276 xid:rsp aed8eb79 < 000035d1 S=6 s=3 Nokia 6230i hint=b125 [
> PnP Modem Fax Telephony IrCOMM IrOBEX ] (28)
> 21:28:53.198384 xid:cmd aed8eb79 > ffffffff S=6 s=4 (14)
> 21:28:53.290382 xid:cmd aed8eb79 > ffffffff S=6 s=5 (14)
> 21:28:53.382341 xid:cmd aed8eb79 > ffffffff S=6 s=* pentium hint=0400 [
> Computer ] (23)
> ^C
> 8 packets received by filter
>
> $ obexftp -i -l MMC
> Connecting..\done
> Receiving "MMC".../<?xml version="1.0"?>
> <!DOCTYPE folder-listing SYSTEM "obex-folder-listing.dtd"
> [ <!ATTLIST folder mem-type CDATA #IMPLIED> ]>
> <folder-listing version="1.0">
> <parent-folder />
> <file name="Image000.jpg" size="304300" modified="20160219T135924"
> user-perm="RWD"/>
> <file name="Image001.jpg" size="270037" modified="20170811T233122"
> user-perm="RWD"/>
> <file name="Image004.jpg" size="53519" modified="20170814T074550"
> user-perm="RWD"/>
> ....
> $ obexftp -i -c MMC -g Image004.jpg
> Connecting..\done
> Sending "MMC"...|done
> Receiving "Image004.jpg"...-done
> Disconnecting..\done
Odd, and is this just a ir device connected to a "real" serial port, or
a specific IRDA device?
thanks,
greg k-h
On Thursday 31 August 2017, Greg KH wrote:
> On Tue, Aug 29, 2017 at 11:32:58PM +0200, Ondrej Zary wrote:
> > On Tuesday 29 August 2017 01:42:08 David Miller wrote:
> > > From: Greg Kroah-Hartman <[email protected]>
> > > Date: Sun, 27 Aug 2017 17:03:30 +0200
> > >
> > > > The IRDA code has long been obsolete and broken. So, to keep people
> > > > from trying to use it, and to prevent people from having to maintain
> > > > it, let's move it to drivers/staging/ so that we can delete it
> > > > entirely from the kernel in a few releases.
> > >
> > > No objection, I'll apply this to net-next, thanks Greg.
> >
> > IRDA works fine in Debian 9 (kernel 4.9) and I use it for simple file
> > transfer. Hope I'm not the only one...
> >
> > # irattach /dev/ttyS0 -d tekram -s
> > # irdadump
> > 21:28:52.830350 xid:cmd aed8eb79 > ffffffff S=6 s=0 (14)
> > 21:28:52.922368 xid:cmd aed8eb79 > ffffffff S=6 s=1 (14)
> > 21:28:53.014350 xid:cmd aed8eb79 > ffffffff S=6 s=2 (14)
> > 21:28:53.106338 xid:cmd aed8eb79 > ffffffff S=6 s=3 (14)
> > 21:28:53.190276 xid:rsp aed8eb79 < 000035d1 S=6 s=3 Nokia 6230i hint=b125
> > [ PnP Modem Fax Telephony IrCOMM IrOBEX ] (28)
> > 21:28:53.198384 xid:cmd aed8eb79 > ffffffff S=6 s=4 (14)
> > 21:28:53.290382 xid:cmd aed8eb79 > ffffffff S=6 s=5 (14)
> > 21:28:53.382341 xid:cmd aed8eb79 > ffffffff S=6 s=* pentium hint=0400 [
> > Computer ] (23)
> > ^C
> > 8 packets received by filter
> >
> > $ obexftp -i -l MMC
> > Connecting..\done
> > Receiving "MMC".../<?xml version="1.0"?>
> > <!DOCTYPE folder-listing SYSTEM "obex-folder-listing.dtd"
> > [ <!ATTLIST folder mem-type CDATA #IMPLIED> ]>
> > <folder-listing version="1.0">
> > <parent-folder />
> > <file name="Image000.jpg" size="304300" modified="20160219T135924"
> > user-perm="RWD"/>
> > <file name="Image001.jpg" size="270037" modified="20170811T233122"
> > user-perm="RWD"/>
> > <file name="Image004.jpg" size="53519" modified="20170814T074550"
> > user-perm="RWD"/>
> > ....
> > $ obexftp -i -c MMC -g Image004.jpg
> > Connecting..\done
> > Sending "MMC"...|done
> > Receiving "Image004.jpg"...-done
> > Disconnecting..\done
>
> Odd, and is this just a ir device connected to a "real" serial port, or
> a specific IRDA device?
>
> thanks,
>
> greg k-h
Yes, it's an external IrDA dongle connected to a real serial port.
I also have an ARK3116-based USB IrDA dongle and some laptops with integrated
IrDA ports that used to work fine but haven't tested them recently (i.e.
Debian 9).
--
Ondrej Zary