Commit edf5c17d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: irda: remove remaining remants of irda code removal 



There were some documentation locations that irda was mentioned, as well
as an old MAINTAINERS entry and the networking sysctl entries.  Clean
these all out as this stuff really is finally gone.

Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 60cc43fc

Documentation/ioctl/ioctl-number.txt

+0 −2
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ Code Seq#(hex) Include File Comments 
'd'	02-40	pcmcia/ds.h		conflict!

'd'	F0-FF	linux/digi1.h

'e'	all	linux/digi1.h		conflict!

'e'	00-1F	drivers/net/irda/irtty-sir.h	conflict!

'f'	00-1F	linux/ext2_fs.h		conflict!

'f'	00-1F	linux/ext3_fs.h		conflict!

'f'	00-0F	fs/jfs/jfs_dinode.h	conflict!
@@ -247,7 +246,6 @@ Code Seq#(hex) Include File Comments 
'm'	all	linux/synclink.h	conflict!

'm'	00-19	drivers/message/fusion/mptctl.h	conflict!

'm'	00	drivers/scsi/megaraid/megaraid_ioctl.h	conflict!

'm'	00-1F	net/irda/irmod.h	conflict!

'n'	00-7F	linux/ncp_fs.h and fs/ncpfs/ioctl.c

'n'	80-8F	uapi/linux/nilfs2_api.h	NILFS2

'n'	E0-FF	linux/matroxfb.h	matroxfb

Documentation/networking/ip-sysctl.txt

+0 −15
Original line number Diff line number Diff line
@@ -2126,18 +2126,3 @@ max_dgram_qlen - INTEGER 


	Default: 10



UNDOCUMENTED:



/proc/sys/net/irda/*

	fast_poll_increase FIXME

	warn_noreply_time FIXME

	discovery_slots FIXME

	slot_timeout FIXME

	max_baud_rate FIXME

	discovery_timeout FIXME

	lap_keepalive_time FIXME

	max_noreply_time FIXME

	max_tx_data_size FIXME

	max_tx_window FIXME

	min_tx_turn_time FIXME

Documentation/process/magic-number.rst

+0 −3
Original line number Diff line number Diff line
@@ -157,8 +157,5 @@ memory management. See ``include/sound/sndmagic.h`` for complete list of them. M 
OSS sound drivers have their magic numbers constructed from the soundcard PCI

ID - these are not listed here as well.



IrDA subsystem also uses large number of own magic numbers, see

``include/net/irda/irda.h`` for a complete list of them.



HFS is another larger user of magic numbers - you can find them in

``fs/hfs/hfs.h``.

MAINTAINERS

+0 −10
Original line number Diff line number Diff line
@@ -7396,16 +7396,6 @@ S: Obsolete 
F:	include/uapi/linux/ipx.h

F:	drivers/staging/ipx/



IRDA SUBSYSTEM

M:	Samuel Ortiz <samuel@sortiz.org>

L:	irda-users@lists.sourceforge.net (subscribers-only)

L:	netdev@vger.kernel.org

W:	http://irda.sourceforge.net/

S:	Obsolete

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git

F:	Documentation/networking/irda.txt

F:	drivers/staging/irda/



IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)

M:	Marc Zyngier <marc.zyngier@arm.com>

S:	Maintained

include/uapi/linux/sysctl.h

+0 −18
Original line number Diff line number Diff line
@@ -780,24 +780,6 @@ enum { 
	NET_BRIDGE_NF_FILTER_PPPOE_TAGGED = 5,

};



/* proc/sys/net/irda */

enum {

	NET_IRDA_DISCOVERY=1,

	NET_IRDA_DEVNAME=2,

	NET_IRDA_DEBUG=3,

	NET_IRDA_FAST_POLL=4,

	NET_IRDA_DISCOVERY_SLOTS=5,

	NET_IRDA_DISCOVERY_TIMEOUT=6,

	NET_IRDA_SLOT_TIMEOUT=7,

	NET_IRDA_MAX_BAUD_RATE=8,

	NET_IRDA_MIN_TX_TURN_TIME=9,

	NET_IRDA_MAX_TX_DATA_SIZE=10,

	NET_IRDA_MAX_TX_WINDOW=11,

	NET_IRDA_MAX_NOREPLY_TIME=12,

	NET_IRDA_WARN_NOREPLY_TIME=13,

	NET_IRDA_LAP_KEEPALIVE_TIME=14,

};





/* CTL_FS names: */

enum

CRA Git | Maintained and supported by SUSTech CRA and CCSE