Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 May 2017 00:34:34 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r318389 - in head/sys: amd64/amd64 arm/arm arm/include crypto/des ddb dev/cs dev/ixgb dev/lge dev/mse dev/my dev/pcn dev/ppbus dev/ppc dev/qlxgb dev/qlxgbe dev/qlxge dev/rl dev/sound/pc...
Message-ID:  <201705170034.v4H0YY0k015810@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste
Date: Wed May 17 00:34:34 2017
New Revision: 318389
URL: https://svnweb.freebsd.org/changeset/base/318389

Log:
  Remove register keyword from sys/ and ANSIfy prototypes
  
  A long long time ago the register keyword told the compiler to store
  the corresponding variable in a CPU register, but it is not relevant
  for any compiler used in the FreeBSD world today.
  
  ANSIfy related prototypes while here.
  
  Reviewed by:	cem, jhb
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D10193

Modified:
  head/sys/amd64/amd64/sys_machdep.c
  head/sys/amd64/amd64/vm_machdep.c
  head/sys/arm/arm/sys_machdep.c
  head/sys/arm/arm/vm_machdep.c
  head/sys/arm/include/atomic-v4.h
  head/sys/crypto/des/des_enc.c
  head/sys/crypto/des/des_setkey.c
  head/sys/ddb/db_access.c
  head/sys/ddb/db_output.c
  head/sys/ddb/db_sym.c
  head/sys/dev/cs/if_cs.c
  head/sys/dev/ixgb/if_ixgb.c
  head/sys/dev/lge/if_lge.c
  head/sys/dev/mse/mse_isa.c
  head/sys/dev/my/if_my.c
  head/sys/dev/pcn/if_pcn.c
  head/sys/dev/ppbus/immio.c
  head/sys/dev/ppbus/vpoio.c
  head/sys/dev/ppc/ppc.c
  head/sys/dev/qlxgb/qla_os.c
  head/sys/dev/qlxgbe/ql_os.c
  head/sys/dev/qlxge/qls_os.c
  head/sys/dev/rl/if_rl.c
  head/sys/dev/sound/pci/fm801.c
  head/sys/dev/speaker/spkr.c
  head/sys/dev/tl/if_tl.c
  head/sys/dev/usb/usb_busdma.c
  head/sys/dev/wb/if_wb.c
  head/sys/dev/xl/if_xl.c
  head/sys/fs/fifofs/fifo_vnops.c
  head/sys/fs/nandfs/nandfs_vnops.c
  head/sys/i386/i386/in_cksum.c
  head/sys/i386/i386/k6_mem.c
  head/sys/i386/i386/sys_machdep.c
  head/sys/i386/i386/vm_machdep.c
  head/sys/i386/ibcs2/ibcs2_misc.c
  head/sys/i386/ibcs2/ibcs2_other.c
  head/sys/i386/ibcs2/ibcs2_signal.c
  head/sys/i386/ibcs2/ibcs2_socksys.c
  head/sys/i386/isa/ccbque.h
  head/sys/i386/isa/elink.c
  head/sys/kern/inflate.c
  head/sys/kern/kern_clock.c
  head/sys/kern/kern_exec.c
  head/sys/kern/kern_prot.c
  head/sys/kern/kern_resource.c
  head/sys/kern/kern_sig.c
  head/sys/kern/kern_timeout.c
  head/sys/kern/kern_xxx.c
  head/sys/kern/sched_4bsd.c
  head/sys/kern/sysv_msg.c
  head/sys/kern/vfs_export.c
  head/sys/kern/vfs_mount.c
  head/sys/kern/vfs_syscalls.c
  head/sys/kern/vfs_vnops.c
  head/sys/libkern/zlib.c
  head/sys/mips/cavium/cryptocteon/cavium_crypto.c
  head/sys/mips/mips/vm_machdep.c
  head/sys/net/altq/altq_rio.c
  head/sys/net/altq/altq_rmclass.h
  head/sys/net/bpf_filter.c
  head/sys/net/if_llatbl.c
  head/sys/net/if_media.c
  head/sys/net/slcompress.c
  head/sys/netinet/in.c
  head/sys/netinet/in_cksum.c
  head/sys/netinet/ip_icmp.c
  head/sys/netinet6/in6_pcb.c
  head/sys/netinet6/raw_ip6.c
  head/sys/netipsec/ipsec_mbuf.c
  head/sys/rpc/clnt.h
  head/sys/sparc64/include/pcpu.h

Modified: head/sys/amd64/amd64/sys_machdep.c
==============================================================================
--- head/sys/amd64/amd64/sys_machdep.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/amd64/amd64/sys_machdep.c	Wed May 17 00:34:34 2017	(r318389)
@@ -169,9 +169,7 @@ update_gdt_fsbase(struct thread *td, uin
 }
 
 int
-sysarch(td, uap)
-	struct thread *td;
-	register struct sysarch_args *uap;
+sysarch(struct thread *td, struct sysarch_args *uap)
 {
 	int error = 0;
 	struct pcb *pcb = curthread->td_pcb;

Modified: head/sys/amd64/amd64/vm_machdep.c
==============================================================================
--- head/sys/amd64/amd64/vm_machdep.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/amd64/amd64/vm_machdep.c	Wed May 17 00:34:34 2017	(r318389)
@@ -148,13 +148,9 @@ alloc_fpusave(int flags)
  * ready to run and return to user mode.
  */
 void
-cpu_fork(td1, p2, td2, flags)
-	register struct thread *td1;
-	register struct proc *p2;
-	struct thread *td2;
-	int flags;
+cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags)
 {
-	register struct proc *p1;
+	struct proc *p1;
 	struct pcb *pcb2;
 	struct mdproc *mdp1, *mdp2;
 	struct proc_ldt *pldt;

Modified: head/sys/arm/arm/sys_machdep.c
==============================================================================
--- head/sys/arm/arm/sys_machdep.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/arm/arm/sys_machdep.c	Wed May 17 00:34:34 2017	(r318389)
@@ -188,9 +188,7 @@ arm32_get_tp(struct thread *td, void *ar
 }
 
 int
-sysarch(td, uap)
-	struct thread *td;
-	register struct sysarch_args *uap;
+sysarch(struct thread *td, struct sysarch_args *uap)
 {
 	int error;
 

Modified: head/sys/arm/arm/vm_machdep.c
==============================================================================
--- head/sys/arm/arm/vm_machdep.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/arm/arm/vm_machdep.c	Wed May 17 00:34:34 2017	(r318389)
@@ -93,8 +93,7 @@ uint32_t initial_fpscr = VFPSCR_DN | VFP
  * ready to run and return to user mode.
  */
 void
-cpu_fork(register struct thread *td1, register struct proc *p2,
-    struct thread *td2, int flags)
+cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags)
 {
 	struct pcb *pcb2;
 	struct trapframe *tf;

Modified: head/sys/arm/include/atomic-v4.h
==============================================================================
--- head/sys/arm/include/atomic-v4.h	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/arm/include/atomic-v4.h	Wed May 17 00:34:34 2017	(r318389)
@@ -299,7 +299,7 @@ atomic_clear_32(volatile uint32_t *addre
 static __inline u_int32_t
 atomic_cmpset_32(volatile u_int32_t *p, volatile u_int32_t cmpval, volatile u_int32_t newval)
 {
-	register int done, ras_start = ARM_RAS_START;
+	int done, ras_start = ARM_RAS_START;
 
 	__asm __volatile("1:\n"
 	    "adr	%1, 1b\n"

Modified: head/sys/crypto/des/des_enc.c
==============================================================================
--- head/sys/crypto/des/des_enc.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/crypto/des/des_enc.c	Wed May 17 00:34:34 2017	(r318389)
@@ -69,14 +69,14 @@ extern	const DES_LONG des_SPtrans[8][64]
 
 void des_encrypt1(DES_LONG *data, des_key_schedule ks, int enc)
 {
-	register DES_LONG l,r,t,u;
+	DES_LONG l,r,t,u;
 #ifdef DES_PTR
-	register const unsigned char *des_SP=(const unsigned char *)des_SPtrans;
+	const unsigned char *des_SP=(const unsigned char *)des_SPtrans;
 #endif
 #ifndef DES_UNROLL
-	register int i;
+	int i;
 #endif
-	register DES_LONG *s;
+	DES_LONG *s;
 
 	r=data[0];
 	l=data[1];
@@ -167,14 +167,14 @@ void des_encrypt1(DES_LONG *data, des_ke
 
 void des_encrypt2(DES_LONG *data, des_key_schedule ks, int enc)
 {
-	register DES_LONG l,r,t,u;
+	DES_LONG l,r,t,u;
 #ifdef DES_PTR
-	register const unsigned char *des_SP=(const unsigned char *)des_SPtrans;
+	const unsigned char *des_SP=(const unsigned char *)des_SPtrans;
 #endif
 #ifndef DES_UNROLL
-	register int i;
+	int i;
 #endif
-	register DES_LONG *s;
+	DES_LONG *s;
 
 	r=data[0];
 	l=data[1];
@@ -259,7 +259,7 @@ void des_encrypt2(DES_LONG *data, des_ke
 void des_encrypt3(DES_LONG *data, des_key_schedule ks1, des_key_schedule ks2,
 	     des_key_schedule ks3)
 {
-	register DES_LONG l,r;
+	DES_LONG l,r;
 
 	l=data[0];
 	r=data[1];
@@ -279,7 +279,7 @@ void des_encrypt3(DES_LONG *data, des_ke
 void des_decrypt3(DES_LONG *data, des_key_schedule ks1, des_key_schedule ks2,
 	     des_key_schedule ks3)
 {
-	register DES_LONG l,r;
+	DES_LONG l,r;
 
 	l=data[0];
 	r=data[1];

Modified: head/sys/crypto/des/des_setkey.c
==============================================================================
--- head/sys/crypto/des/des_setkey.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/crypto/des/des_setkey.c	Wed May 17 00:34:34 2017	(r318389)
@@ -172,10 +172,10 @@ int des_set_key_checked(des_cblock *key,
 void des_set_key_unchecked(des_cblock *key, des_key_schedule schedule)
 {
 	static int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
-	register DES_LONG c,d,t,s,t2;
-	register const unsigned char *in;
-	register DES_LONG *k;
-	register int i;
+	DES_LONG c,d,t,s,t2;
+	const unsigned char *in;
+	DES_LONG *k;
+	int i;
 
 	k = &schedule->ks.deslong[0];
 	in = &(*key)[0];

Modified: head/sys/ddb/db_access.c
==============================================================================
--- head/sys/ddb/db_access.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/ddb/db_access.c	Wed May 17 00:34:34 2017	(r318389)
@@ -57,8 +57,8 @@ db_expr_t
 db_get_value(db_addr_t addr, int size, bool is_signed)
 {
 	char		data[sizeof(u_int64_t)];
-	register db_expr_t value;
-	register int	i;
+	db_expr_t	value;
+	int		i;
 
 	if (db_read_bytes(addr, size, data) != 0) {
 		db_printf("*** error reading from address %llx ***\n",
@@ -87,7 +87,7 @@ void
 db_put_value(db_addr_t addr, int size, db_expr_t value)
 {
 	char		data[sizeof(int)];
-	register int	i;
+	int		i;
 
 #if	BYTE_MSF
 	for (i = size - 1; i >= 0; i--)

Modified: head/sys/ddb/db_output.c
==============================================================================
--- head/sys/ddb/db_output.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/ddb/db_output.c	Wed May 17 00:34:34 2017	(r318389)
@@ -92,7 +92,7 @@ static void	db_pager(void);
 void
 db_force_whitespace(void)
 {
-	register int last_print, next_tab;
+	int last_print, next_tab;
 
 	last_print = db_last_non_space;
 	while (last_print < db_output_position) {
@@ -355,7 +355,7 @@ db_iprintf(const char *fmt,...)
 	char bufr[DDB_BUFR_SIZE];
 #endif
 	struct dbputchar_arg dca;
-	register int i;
+	int i;
 	va_list listp;
 
 	for (i = db_indent; i >= 8; i -= 8)

Modified: head/sys/ddb/db_sym.c
==============================================================================
--- head/sys/ddb/db_sym.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/ddb/db_sym.c	Wed May 17 00:34:34 2017	(r318389)
@@ -286,10 +286,10 @@ static c_db_sym_t
 db_lookup(const char *symstr)
 {
 	c_db_sym_t sp;
-	register int i;
+	int i;
 	int symtab_start = 0;
 	int symtab_end = db_nsymtab;
-	register const char *cp;
+	const char *cp;
 
 	/*
 	 * Look for, remove, and remember any symbol table specifier.
@@ -343,8 +343,8 @@ static bool
 db_symbol_is_ambiguous(c_db_sym_t sym)
 {
 	const char	*sym_name;
-	register int	i;
-	register bool	found_once = false;
+	int		i;
+	bool		found_once = false;
 
 	if (!db_qualify_ambiguous_names)
 		return (false);
@@ -367,10 +367,9 @@ db_symbol_is_ambiguous(c_db_sym_t sym)
 c_db_sym_t
 db_search_symbol(db_addr_t val, db_strategy_t strategy, db_expr_t *offp)
 {
-	register
 	unsigned int	diff;
 	size_t		newdiff;
-	register int	i;
+	int		i;
 	c_db_sym_t	ret = C_DB_SYM_NULL, sym;
 
 	newdiff = diff = val;

Modified: head/sys/dev/cs/if_cs.c
==============================================================================
--- head/sys/dev/cs/if_cs.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/cs/if_cs.c	Wed May 17 00:34:34 2017	(r318389)
@@ -1038,7 +1038,7 @@ cs_setmode(struct cs_softc *sc)
 }
 
 static int
-cs_ioctl(register struct ifnet *ifp, u_long command, caddr_t data)
+cs_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct cs_softc *sc=ifp->if_softc;
 	struct ifreq *ifr = (struct ifreq *)data;

Modified: head/sys/dev/ixgb/if_ixgb.c
==============================================================================
--- head/sys/dev/ixgb/if_ixgb.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/ixgb/if_ixgb.c	Wed May 17 00:34:34 2017	(r318389)
@@ -1777,7 +1777,7 @@ static int
 ixgb_get_buf(int i, struct adapter * adapter,
 	     struct mbuf * nmp)
 {
-	struct mbuf *mp = nmp;
+	struct mbuf    *mp = nmp;
 	struct ixgb_buffer *rx_buffer;
 	struct ifnet   *ifp;
 	bus_addr_t      paddr;

Modified: head/sys/dev/lge/if_lge.c
==============================================================================
--- head/sys/dev/lge/if_lge.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/lge/if_lge.c	Wed May 17 00:34:34 2017	(r318389)
@@ -216,7 +216,7 @@ lge_eeprom_getword(sc, addr, dest)
 	int			addr;
 	u_int16_t		*dest;
 {
-	register int		i;
+	int			i;
 	u_int32_t		val;
 
 	CSR_WRITE_4(sc, LGE_EECTL, LGE_EECTL_CMD_READ|
@@ -413,7 +413,7 @@ static void
 lge_reset(sc)
 	struct lge_softc	*sc;
 {
-	register int		i;
+	int			i;
 
 	LGE_SETBIT(sc, LGE_MODE1, LGE_MODE1_SETRST_CTL0|LGE_MODE1_SOFTRST);
 
@@ -756,7 +756,7 @@ lge_alloc_jumbo_mem(sc)
 	struct lge_softc	*sc;
 {
 	caddr_t			ptr;
-	register int		i;
+	int			i;
 	struct lge_jpool_entry   *entry;
 
 	/* Grab a big chunk o' storage. */
@@ -1524,7 +1524,7 @@ static void
 lge_stop(sc)
 	struct lge_softc	*sc;
 {
-	register int		i;
+	int			i;
 	struct ifnet		*ifp;
 
 	LGE_LOCK_ASSERT(sc);

Modified: head/sys/dev/mse/mse_isa.c
==============================================================================
--- head/sys/dev/mse/mse_isa.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/mse/mse_isa.c	Wed May 17 00:34:34 2017	(r318389)
@@ -309,7 +309,7 @@ mse_disablelogi(struct resource *port)
 static void
 mse_getlogi(struct resource *port, int *dx, int *dy, int *but)
 {
-	register char x, y;
+	char x, y;
 
 	bus_write_1(port, MSE_PORTC, MSE_HOLD | MSE_RXLOW);
 	x = bus_read_1(port, MSE_PORTA);

Modified: head/sys/dev/my/if_my.c
==============================================================================
--- head/sys/dev/my/if_my.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/my/if_my.c	Wed May 17 00:34:34 2017	(r318389)
@@ -751,7 +751,7 @@ my_setcfg(struct my_softc * sc, int bmcr
 static void
 my_reset(struct my_softc * sc)
 {
-	register int    i;
+	int    i;
 
 	MY_LOCK_ASSERT(sc);
 	MY_SETBIT(sc, MY_BCR, MY_SWR);
@@ -1717,7 +1717,7 @@ my_watchdog(void *arg)
 static void
 my_stop(struct my_softc * sc)
 {
-	register int    i;
+	int    i;
 	struct ifnet   *ifp;
 
 	MY_LOCK_ASSERT(sc);

Modified: head/sys/dev/pcn/if_pcn.c
==============================================================================
--- head/sys/dev/pcn/if_pcn.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/pcn/if_pcn.c	Wed May 17 00:34:34 2017	(r318389)
@@ -1453,7 +1453,7 @@ pcn_watchdog(struct pcn_softc *sc)
 static void
 pcn_stop(struct pcn_softc *sc)
 {
-	register int		i;
+	int			i;
 	struct ifnet		*ifp;
 
 	PCN_LOCK_ASSERT(sc);

Modified: head/sys/dev/ppbus/immio.c
==============================================================================
--- head/sys/dev/ppbus/immio.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/ppbus/immio.c	Wed May 17 00:34:34 2017	(r318389)
@@ -674,10 +674,10 @@ imm_do_scsi(struct vpoio_data *vpo, int 
 		int *ret)
 {
 	device_t ppbus = device_get_parent(vpo->vpo_dev);
-	register char r;
+	char r;
 	char l, h = 0;
 	int len, error = 0, not_connected = 0;
-	register int k;
+	int k;
 	int negociated = 0;
 
 	/*

Modified: head/sys/dev/ppbus/vpoio.c
==============================================================================
--- head/sys/dev/ppbus/vpoio.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/ppbus/vpoio.c	Wed May 17 00:34:34 2017	(r318389)
@@ -680,10 +680,10 @@ vpoio_do_scsi(struct vpoio_data *vpo, in
 		int *ret)
 {
 	device_t ppbus = device_get_parent(vpo->vpo_dev);
-	register char r;
+	char r;
 	char l, h = 0;
 	int len, error = 0;
-	register int k;
+	int k;
 
 	/*
 	 * enter disk state, allocate the ppbus

Modified: head/sys/dev/ppc/ppc.c
==============================================================================
--- head/sys/dev/ppc/ppc.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/ppc/ppc.c	Wed May 17 00:34:34 2017	(r318389)
@@ -285,7 +285,7 @@ ppc_detect_port(struct ppc_data *ppc)
 static void
 ppc_reset_epp_timeout(struct ppc_data *ppc)
 {
-	register char r;
+	char r;
 
 	r = r_str(ppc);
 	w_str(ppc, r | 0x1);
@@ -1321,10 +1321,10 @@ ppc_exec_microseq(device_t dev, struct p
 	int i, iter, len;
 	int error;
 
-	register int reg;
-	register char mask;
-	register int accum = 0;
-	register char *ptr = NULL;
+	int reg;
+	char mask;
+	int accum = 0;
+	char *ptr = NULL;
 
 	struct ppb_microseq *stack = NULL;
 

Modified: head/sys/dev/qlxgb/qla_os.c
==============================================================================
--- head/sys/dev/qlxgb/qla_os.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/qlxgb/qla_os.c	Wed May 17 00:34:34 2017	(r318389)
@@ -1401,7 +1401,7 @@ int
 qla_get_mbuf(qla_host_t *ha, qla_rx_buf_t *rxb, struct mbuf *nmp,
 	uint32_t jumbo)
 {
-	register struct mbuf *mp = nmp;
+	struct mbuf *mp = nmp;
 	struct ifnet   *ifp;
 	int             ret = 0;
 	uint32_t	offset;

Modified: head/sys/dev/qlxgbe/ql_os.c
==============================================================================
--- head/sys/dev/qlxgbe/ql_os.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/qlxgbe/ql_os.c	Wed May 17 00:34:34 2017	(r318389)
@@ -1797,7 +1797,7 @@ qla_free_rcv_bufs(qla_host_t *ha)
 int
 ql_get_mbuf(qla_host_t *ha, qla_rx_buf_t *rxb, struct mbuf *nmp)
 {
-	register struct mbuf *mp = nmp;
+	struct mbuf *mp = nmp;
 	struct ifnet   		*ifp;
 	int            		ret = 0;
 	uint32_t		offset;

Modified: head/sys/dev/qlxge/qls_os.c
==============================================================================
--- head/sys/dev/qlxge/qls_os.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/qlxge/qls_os.c	Wed May 17 00:34:34 2017	(r318389)
@@ -1396,7 +1396,7 @@ qls_alloc_rcv_bufs(qla_host_t *ha)
 int
 qls_get_mbuf(qla_host_t *ha, qla_rx_buf_t *rxb, struct mbuf *nmp)
 {
-	register struct mbuf *mp = nmp;
+	struct mbuf *mp = nmp;
 	struct ifnet   		*ifp;
 	int            		ret = 0;
 	uint32_t		offset;

Modified: head/sys/dev/rl/if_rl.c
==============================================================================
--- head/sys/dev/rl/if_rl.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/rl/if_rl.c	Wed May 17 00:34:34 2017	(r318389)
@@ -276,7 +276,7 @@ DRIVER_MODULE(miibus, rl, miibus_driver,
 static void
 rl_eeprom_putbyte(struct rl_softc *sc, int addr)
 {
-	register int		d, i;
+	int			d, i;
 
 	d = addr | sc->rl_eecmd_read;
 
@@ -303,7 +303,7 @@ rl_eeprom_putbyte(struct rl_softc *sc, i
 static void
 rl_eeprom_getword(struct rl_softc *sc, int addr, uint16_t *dest)
 {
-	register int		i;
+	int			i;
 	uint16_t		word = 0;
 
 	/* Enter EEPROM access mode. */
@@ -561,7 +561,7 @@ rl_rxfilter(struct rl_softc *sc)
 static void
 rl_reset(struct rl_softc *sc)
 {
-	register int		i;
+	int			i;
 
 	RL_LOCK_ASSERT(sc);
 
@@ -1912,7 +1912,7 @@ rl_watchdog(struct rl_softc *sc)
 static void
 rl_stop(struct rl_softc *sc)
 {
-	register int		i;
+	int			i;
 	struct ifnet		*ifp = sc->rl_ifp;
 
 	RL_LOCK_ASSERT(sc);

Modified: head/sys/dev/sound/pci/fm801.c
==============================================================================
--- head/sys/dev/sound/pci/fm801.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/sound/pci/fm801.c	Wed May 17 00:34:34 2017	(r318389)
@@ -394,7 +394,7 @@ fm801ch_setspeed(kobj_t obj, void *data,
 {
 	struct fm801_chinfo *ch = data;
 	struct fm801_info *fm801 = ch->parent;
-	register int i;
+	int i;
 
 
 	for (i = 0; i < 10 && fm801_rates[i].limit <= speed; i++) ;

Modified: head/sys/dev/speaker/spkr.c
==============================================================================
--- head/sys/dev/speaker/spkr.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/speaker/spkr.c	Wed May 17 00:34:34 2017	(r318389)
@@ -201,7 +201,7 @@ playinit()
 static void
 playtone(int pitch, int value, int sustain)
 {
-	register int sound, silence, snum = 1, sdenom = 1;
+	int sound, silence, snum = 1, sdenom = 1;
 
 	/* this weirdness avoids floating-point arithmetic */
 	for (; sustain; sustain--) {
@@ -243,7 +243,7 @@ playstring(char *cp, size_t slen)
 				{v = v * 10 + (*++cp - '0'); slen--;}
 	for (; slen--; cp++) {
 		int sustain, timeval, tempo;
-		register char c = toupper(*cp);
+		char c = toupper(*cp);
 
 #ifdef DEBUG
 		(void) printf("playstring: %c (%x)\n", c, c);

Modified: head/sys/dev/tl/if_tl.c
==============================================================================
--- head/sys/dev/tl/if_tl.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/tl/if_tl.c	Wed May 17 00:34:34 2017	(r318389)
@@ -534,7 +534,7 @@ static u_int8_t tl_eeprom_putbyte(sc, by
 	struct tl_softc		*sc;
 	int			byte;
 {
-	register int		i, ack = 0;
+	int			i, ack = 0;
 
 	/*
 	 * Make sure we're in TX mode.
@@ -579,7 +579,7 @@ static u_int8_t tl_eeprom_getbyte(sc, ad
 	int			addr;
 	u_int8_t		*dest;
 {
-	register int		i;
+	int			i;
 	u_int8_t		byte = 0;
 	device_t		tl_dev = sc->tl_dev;
 
@@ -2199,7 +2199,7 @@ static void
 tl_stop(sc)
 	struct tl_softc		*sc;
 {
-	register int		i;
+	int			i;
 	struct ifnet		*ifp;
 
 	TL_LOCK_ASSERT(sc);

Modified: head/sys/dev/usb/usb_busdma.c
==============================================================================
--- head/sys/dev/usb/usb_busdma.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/usb/usb_busdma.c	Wed May 17 00:34:34 2017	(r318389)
@@ -232,7 +232,7 @@ struct usb_m_copy_in_arg {
 static int
 usbd_m_copy_in_cb(void *arg, void *src, uint32_t count)
 {
-	register struct usb_m_copy_in_arg *ua = arg;
+	struct usb_m_copy_in_arg *ua = arg;
 
 	usbd_copy_in(ua->cache, ua->dst_offset, src, count);
 	ua->dst_offset += count;

Modified: head/sys/dev/wb/if_wb.c
==============================================================================
--- head/sys/dev/wb/if_wb.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/wb/if_wb.c	Wed May 17 00:34:34 2017	(r318389)
@@ -256,7 +256,7 @@ wb_eeprom_putbyte(sc, addr)
 	struct wb_softc		*sc;
 	int			addr;
 {
-	register int		d, i;
+	int			d, i;
 
 	d = addr | WB_EECMD_READ;
 
@@ -286,7 +286,7 @@ wb_eeprom_getword(sc, addr, dest)
 	int			addr;
 	u_int16_t		*dest;
 {
-	register int		i;
+	int			i;
 	u_int16_t		word = 0;
 
 	/* Enter EEPROM access mode. */
@@ -507,7 +507,7 @@ static void
 wb_reset(sc)
 	struct wb_softc		*sc;
 {
-	register int		i;
+	int			i;
 	struct mii_data		*mii;
 	struct mii_softc	*miisc;
 
@@ -1574,7 +1574,7 @@ static void
 wb_stop(sc)
 	struct wb_softc		*sc;
 {
-	register int		i;
+	int			i;
 	struct ifnet		*ifp;
 
 	WB_LOCK_ASSERT(sc);

Modified: head/sys/dev/xl/if_xl.c
==============================================================================
--- head/sys/dev/xl/if_xl.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/dev/xl/if_xl.c	Wed May 17 00:34:34 2017	(r318389)
@@ -353,7 +353,7 @@ xl_dma_map_addr(void *arg, bus_dma_segme
 static void
 xl_wait(struct xl_softc *sc)
 {
-	register int		i;
+	int			i;
 
 	for (i = 0; i < XL_TIMEOUT; i++) {
 		if ((CSR_READ_2(sc, XL_STATUS) & XL_STAT_CMDBUSY) == 0)
@@ -836,7 +836,7 @@ xl_setmode(struct xl_softc *sc, int medi
 static void
 xl_reset(struct xl_softc *sc)
 {
-	register int		i;
+	int			i;
 
 	XL_LOCK_ASSERT(sc);
 
@@ -3153,7 +3153,7 @@ xl_watchdog(struct xl_softc *sc)
 static void
 xl_stop(struct xl_softc *sc)
 {
-	register int		i;
+	int			i;
 	struct ifnet		*ifp = sc->xl_ifp;
 
 	XL_LOCK_ASSERT(sc);

Modified: head/sys/fs/fifofs/fifo_vnops.c
==============================================================================
--- head/sys/fs/fifofs/fifo_vnops.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/fs/fifofs/fifo_vnops.c	Wed May 17 00:34:34 2017	(r318389)
@@ -313,7 +313,7 @@ int
 fifo_printinfo(vp)
 	struct vnode *vp;
 {
-	register struct fifoinfo *fip = vp->v_fifoinfo;
+	struct fifoinfo *fip = vp->v_fifoinfo;
 
 	if (fip == NULL){
 		printf(", NULL v_fifoinfo");

Modified: head/sys/fs/nandfs/nandfs_vnops.c
==============================================================================
--- head/sys/fs/nandfs/nandfs_vnops.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/fs/nandfs/nandfs_vnops.c	Wed May 17 00:34:34 2017	(r318389)
@@ -129,8 +129,8 @@ nandfs_reclaim(struct vop_reclaim_args *
 static int
 nandfs_read(struct vop_read_args *ap)
 {
-	register struct vnode *vp = ap->a_vp;
-	register struct nandfs_node *node = VTON(vp);
+	struct vnode *vp = ap->a_vp;
+	struct nandfs_node *node = VTON(vp);
 	struct nandfs_device *nandfsdev = node->nn_nandfsdev;
 	struct uio *uio = ap->a_uio;
 	struct buf *bp;

Modified: head/sys/i386/i386/in_cksum.c
==============================================================================
--- head/sys/i386/i386/in_cksum.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/i386/i386/in_cksum.c	Wed May 17 00:34:34 2017	(r318389)
@@ -263,9 +263,9 @@ in_cksum_skip(m, len, skip)
 	int len;
 	int skip;
 {
-	register u_short *w;
-	register unsigned sum = 0;
-	register int mlen = 0;
+	u_short *w;
+	unsigned sum = 0;
+	int mlen = 0;
 	int byte_swapped = 0;
 	union { char	c[2]; u_short	s; } su;
 

Modified: head/sys/i386/i386/k6_mem.c
==============================================================================
--- head/sys/i386/i386/k6_mem.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/i386/i386/k6_mem.c	Wed May 17 00:34:34 2017	(r318389)
@@ -78,7 +78,7 @@ static __inline int
 k6_mrmake(struct mem_range_desc *desc, u_int32_t *mtrr)
 {
 	u_int32_t len = 0, wc, uc;
-	register int bit;
+	int bit;
 
 	if (desc->mr_base &~ 0xfffe0000)
 		return (EINVAL);

Modified: head/sys/i386/i386/sys_machdep.c
==============================================================================
--- head/sys/i386/i386/sys_machdep.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/i386/i386/sys_machdep.c	Wed May 17 00:34:34 2017	(r318389)
@@ -98,9 +98,7 @@ struct sysarch_args {
 #endif
 
 int
-sysarch(td, uap)
-	struct thread *td;
-	register struct sysarch_args *uap;
+sysarch(struct thread *td, struct sysarch_args *uap)
 {
 	int error;
 	union descriptor *lp;

Modified: head/sys/i386/i386/vm_machdep.c
==============================================================================
--- head/sys/i386/i386/vm_machdep.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/i386/i386/vm_machdep.c	Wed May 17 00:34:34 2017	(r318389)
@@ -166,7 +166,7 @@ alloc_fpusave(int flags)
 void
 cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags)
 {
-	register struct proc *p1;
+	struct proc *p1;
 	struct pcb *pcb2;
 	struct mdproc *mdp2;
 

Modified: head/sys/i386/ibcs2/ibcs2_misc.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_misc.c	Tue May 16 23:31:52 2017	(r318388)
+++ head/sys/i386/ibcs2/ibcs2_misc.c	Wed May 17 00:34:34 2017	(r318389)
@@ -93,9 +93,7 @@ __FBSDID("$FreeBSD$");
 #include <security/mac/mac_framework.h>
 
 int
-ibcs2_ulimit(td, uap)
-	struct thread *td;
-	struct ibcs2_ulimit_args *uap;
+ibcs2_ulimit(struct thread *td, struct ibcs2_ulimit_args *uap)
 {
 	struct rlimit rl;
 	int error;
@@ -134,9 +132,7 @@ ibcs2_ulimit(td, uap)
 #define IBCS2_WSTOPPED       0177
 #define IBCS2_STOPCODE(sig)  ((sig) << 8 | IBCS2_WSTOPPED)
 int
-ibcs2_wait(td, uap)
-	struct thread *td;
-	struct ibcs2_wait_args *uap;
+ibcs2_wait(struct thread *td, struct ibcs2_wait_args *uap)
 {
 	int error, options, status;
 	int *statusp;
@@ -185,9 +181,7 @@ ibcs2_wait(td, uap)
 }
 
 int
-ibcs2_execv(td, uap)
-	struct thread *td;
-	struct ibcs2_execv_args *uap;
+ibcs2_execv(struct thread *td, struct ibcs2_execv_args *uap)
 {
 	struct image_args eargs;
 	struct vmspace *oldvmspace;
@@ -210,9 +204,7 @@ ibcs2_execv(td, uap)
 }
 
 int
-ibcs2_execve(td, uap) 
-        struct thread *td;
-        struct ibcs2_execve_args *uap;
+ibcs2_execve(struct thread *td, struct ibcs2_execve_args *uap)
 {
 	struct image_args eargs;
 	struct vmspace *oldvmspace;
@@ -236,9 +228,7 @@ ibcs2_execve(td, uap) 
 }
 
 int
-ibcs2_umount(td, uap)
-	struct thread *td;
-	struct ibcs2_umount_args *uap;
+ibcs2_umount(struct thread *td, struct ibcs2_umount_args *uap)
 {
 	struct unmount_args um;
 
@@ -248,9 +238,7 @@ ibcs2_umount(td, uap)
 }
 
 int
-ibcs2_mount(td, uap)
-	struct thread *td;
-	struct ibcs2_mount_args *uap;
+ibcs2_mount(struct thread *td, struct ibcs2_mount_args *uap)
 {
 #ifdef notyet
 	int oflags = uap->flags, nflags, error;
@@ -321,15 +309,13 @@ ibcs2_mount(td, uap)
  */
 
 int
-ibcs2_getdents(td, uap)
-	struct thread *td;
-	register struct ibcs2_getdents_args *uap;
-{
-	register struct vnode *vp;
-	register caddr_t inp, buf;	/* BSD-format */
-	register int len, reclen;	/* BSD-format */
-	register caddr_t outp;		/* iBCS2-format */
-	register int resid;		/* iBCS2-format */
+ibcs2_getdents(struct thread *td, struct ibcs2_getdents_args *uap)
+{
+	struct vnode *vp;
+	caddr_t inp, buf;		/* BSD-format */
+	int len, reclen;		/* BSD-format */
+	caddr_t outp;			/* iBCS2-format */
+	int resid;			/* iBCS2-format */
 	cap_rights_t rights;
 	struct file *fp;
 	struct uio auio;
@@ -475,15 +461,13 @@ out:
 }
 
 int
-ibcs2_read(td, uap)
-	struct thread *td;
-	struct ibcs2_read_args *uap;
-{
-	register struct vnode *vp;
-	register caddr_t inp, buf;	/* BSD-format */
-	register int len, reclen;	/* BSD-format */
-	register caddr_t outp;		/* iBCS2-format */
-	register int resid;		/* iBCS2-format */
+ibcs2_read(struct thread *td, struct ibcs2_read_args *uap)
+{
+	struct vnode *vp;
+	caddr_t inp, buf;		/* BSD-format */
+	int len, reclen;		/* BSD-format */
+	caddr_t outp;			/* iBCS2-format */
+	int resid;			/* iBCS2-format */
 	cap_rights_t rights;
 	struct file *fp;
 	struct uio auio;
@@ -640,9 +624,7 @@ out:
 }
 
 int
-ibcs2_mknod(td, uap)
-	struct thread *td;
-	struct ibcs2_mknod_args *uap;
+ibcs2_mknod(struct thread *td, struct ibcs2_mknod_args *uap)
 {
 	char *path;
 	int error;
@@ -660,9 +642,7 @@ ibcs2_mknod(td, uap)
 }
 
 int
-ibcs2_getgroups(td, uap)
-	struct thread *td;
-	struct ibcs2_getgroups_args *uap;
+ibcs2_getgroups(struct thread *td, struct ibcs2_getgroups_args *uap)
 {
 	struct ucred *cred;
 	ibcs2_gid_t *iset;
@@ -690,9 +670,7 @@ out:
 }
 
 int
-ibcs2_setgroups(td, uap)
-	struct thread *td;
-	struct ibcs2_setgroups_args *uap;
+ibcs2_setgroups(struct thread *td, struct ibcs2_setgroups_args *uap)
 {
 	ibcs2_gid_t *iset;
 	gid_t *gp;
@@ -722,9 +700,7 @@ out:
 }
 
 int
-ibcs2_setuid(td, uap)
-	struct thread *td;
-	struct ibcs2_setuid_args *uap;
+ibcs2_setuid(struct thread *td, struct ibcs2_setuid_args *uap)
 {
 	struct setuid_args sa;
 
@@ -733,9 +709,7 @@ ibcs2_setuid(td, uap)
 }
 
 int
-ibcs2_setgid(td, uap)
-	struct thread *td;
-	struct ibcs2_setgid_args *uap;
+ibcs2_setgid(struct thread *td, struct ibcs2_setgid_args *uap)
 {
 	struct setgid_args sa;
 
@@ -744,9 +718,7 @@ ibcs2_setgid(td, uap)
 }
 
 int
-ibcs2_time(td, uap)
-	struct thread *td;
-	struct ibcs2_time_args *uap;
+ibcs2_time(struct thread *td, struct ibcs2_time_args *uap)
 {
 	struct timeval tv;
 
@@ -760,9 +732,7 @@ ibcs2_time(td, uap)
 }
 
 int
-ibcs2_pathconf(td, uap)
-	struct thread *td;
-	struct ibcs2_pathconf_args *uap;
+ibcs2_pathconf(struct thread *td, struct ibcs2_pathconf_args *uap)
 {
 	char *path;
 	int error;
@@ -775,18 +745,14 @@ ibcs2_pathconf(td, uap)
 }
 
 int
-ibcs2_fpathconf(td, uap)
-	struct thread *td;
-	struct ibcs2_fpathconf_args *uap;
+ibcs2_fpathconf(struct thread *td, struct ibcs2_fpathconf_args *uap)
 {
 	uap->name++;	/* iBCS2 _PC_* defines are offset by one */
         return sys_fpathconf(td, (struct fpathconf_args *)uap);
 }
 
 int
-ibcs2_sysconf(td, uap)
-	struct thread *td;
-	struct ibcs2_sysconf_args *uap;
+ibcs2_sysconf(struct thread *td, struct ibcs2_sysconf_args *uap)
 {
 	int mib[2], value, len, error;
 
@@ -845,9 +811,7 @@ ibcs2_sysconf(td, uap)
 }
 
 int
-ibcs2_alarm(td, uap)
-	struct thread *td;
-	struct ibcs2_alarm_args *uap;
+ibcs2_alarm(struct thread *td, struct ibcs2_alarm_args *uap)
 {
 	struct itimerval itv, oitv;
 	int error;
@@ -865,9 +829,7 @@ ibcs2_alarm(td, uap)
 }
 
 int
-ibcs2_times(td, uap)
-	struct thread *td;
-	struct ibcs2_times_args *uap;
+ibcs2_times(struct thread *td, struct ibcs2_times_args *uap)
 {
 	struct rusage ru;
 	struct timeval t;
@@ -895,9 +857,7 @@ ibcs2_times(td, uap)
 }
 
 int
-ibcs2_stime(td, uap)
-	struct thread *td;
-	struct ibcs2_stime_args *uap;
+ibcs2_stime(struct thread *td, struct ibcs2_stime_args *uap)
 {
 	struct timeval tv;
 	long secs;
@@ -915,9 +875,7 @@ ibcs2_stime(td, uap)
 }
 
 int
-ibcs2_utime(td, uap)
-	struct thread *td;
-	struct ibcs2_utime_args *uap;
+ibcs2_utime(struct thread *td, struct ibcs2_utime_args *uap)
 {
 	struct ibcs2_utimbuf ubuf;
 	struct timeval tbuf[2], *tp;
@@ -944,9 +902,7 @@ ibcs2_utime(td, uap)
 }
 
 int
-ibcs2_nice(td, uap)
-	struct thread *td;
-	struct ibcs2_nice_args *uap;
+ibcs2_nice(struct thread *td, struct ibcs2_nice_args *uap)
 {
 	int error;
 	struct setpriority_args sa;
@@ -965,9 +921,7 @@ ibcs2_nice(td, uap)
  */
 
 int
-ibcs2_pgrpsys(td, uap)
-	struct thread *td;
-	struct ibcs2_pgrpsys_args *uap;
+ibcs2_pgrpsys(struct thread *td, struct ibcs2_pgrpsys_args *uap)
 {
 	struct proc *p = td->td_proc;
 	switch (uap->type) {
@@ -1012,9 +966,7 @@ ibcs2_pgrpsys(td, uap)
  */
 
 int
-ibcs2_plock(td, uap)
-	struct thread *td;
-	struct ibcs2_plock_args *uap;
+ibcs2_plock(struct thread *td, struct ibcs2_plock_args *uap)
 {
 	int error;
 #define IBCS2_UNLOCK	0
@@ -1044,9 +996,7 @@ ibcs2_plock(td, uap)
 }
 
 int
-ibcs2_uadmin(td, uap)
-	struct thread *td;
-	struct ibcs2_uadmin_args *uap;
+ibcs2_uadmin(struct thread *td, struct ibcs2_uadmin_args *uap)
 {
 #define SCO_A_REBOOT        1
 #define SCO_A_SHUTDOWN      2
@@ -1093,9 +1043,7 @@ ibcs2_uadmin(td, uap)
 }
 
 int
-ibcs2_sysfs(td, uap)
-	struct thread *td;
-	struct ibcs2_sysfs_args *uap;
+ibcs2_sysfs(struct thread *td, struct ibcs2_sysfs_args *uap)
 {
 #define IBCS2_GETFSIND        1
 #define IBCS2_GETFSTYP        2
@@ -1111,9 +1059,7 @@ ibcs2_sysfs(td, uap)
 }
 
 int
-ibcs2_unlink(td, uap)
-	struct thread *td;
-	struct ibcs2_unlink_args *uap;
+ibcs2_unlink(struct thread *td, struct ibcs2_unlink_args *uap)
 {
 	char *path;
 	int error;
@@ -1125,9 +1071,7 @@ ibcs2_unlink(td, uap)
 }
 
 int
-ibcs2_chdir(td, uap)
-	struct thread *td;
-	struct ibcs2_chdir_args *uap;
+ibcs2_chdir(struct thread *td, struct ibcs2_chdir_args *uap)
 {
 	char *path;
 	int error;
@@ -1139,9 +1083,7 @@ ibcs2_chdir(td, uap)
 }
 
 int

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705170034.v4H0YY0k015810>