Skip to content

Commit 9d2f112

Browse files
Alexey Dobriyandavem330
authored andcommitted
net: delete "register" keyword
Delete long obsoleted "register" keyword. Signed-off-by: Alexey Dobriyan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 4b4de39 commit 9d2f112

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

drivers/net/ethernet/apple/bmac.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -815,8 +815,8 @@ static int reverse6[64] = {
815815
static unsigned int
816816
crc416(unsigned int curval, unsigned short nxtval)
817817
{
818-
register unsigned int counter, cur = curval, next = nxtval;
819-
register int high_crc_set, low_data_set;
818+
unsigned int counter, cur = curval, next = nxtval;
819+
int high_crc_set, low_data_set;
820820

821821
/* Swap bytes */
822822
next = ((next & 0x00FF) << 8) | (next >> 8);

drivers/net/slip/slhc.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ static unsigned short pull16(unsigned char **cpp);
9191
struct slcompress *
9292
slhc_init(int rslots, int tslots)
9393
{
94-
register short i;
95-
register struct cstate *ts;
94+
short i;
95+
struct cstate *ts;
9696
struct slcompress *comp;
9797

9898
if (rslots < 0 || rslots > 255 || tslots < 0 || tslots > 255)
@@ -206,7 +206,7 @@ pull16(unsigned char **cpp)
206206
static long
207207
decode(unsigned char **cpp)
208208
{
209-
register int x;
209+
int x;
210210

211211
x = *(*cpp)++;
212212
if(x == 0){
@@ -227,14 +227,14 @@ int
227227
slhc_compress(struct slcompress *comp, unsigned char *icp, int isize,
228228
unsigned char *ocp, unsigned char **cpp, int compress_cid)
229229
{
230-
register struct cstate *ocs = &(comp->tstate[comp->xmit_oldest]);
231-
register struct cstate *lcs = ocs;
232-
register struct cstate *cs = lcs->next;
233-
register unsigned long deltaS, deltaA;
234-
register short changes = 0;
230+
struct cstate *ocs = &(comp->tstate[comp->xmit_oldest]);
231+
struct cstate *lcs = ocs;
232+
struct cstate *cs = lcs->next;
233+
unsigned long deltaS, deltaA;
234+
short changes = 0;
235235
int hlen;
236236
unsigned char new_seq[16];
237-
register unsigned char *cp = new_seq;
237+
unsigned char *cp = new_seq;
238238
struct iphdr *ip;
239239
struct tcphdr *th, *oth;
240240
__sum16 csum;
@@ -486,11 +486,11 @@ slhc_compress(struct slcompress *comp, unsigned char *icp, int isize,
486486
int
487487
slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
488488
{
489-
register int changes;
489+
int changes;
490490
long x;
491-
register struct tcphdr *thp;
492-
register struct iphdr *ip;
493-
register struct cstate *cs;
491+
struct tcphdr *thp;
492+
struct iphdr *ip;
493+
struct cstate *cs;
494494
int len, hdrlen;
495495
unsigned char *cp = icp;
496496

@@ -543,7 +543,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
543543
switch(changes & SPECIALS_MASK){
544544
case SPECIAL_I: /* Echoed terminal traffic */
545545
{
546-
register short i;
546+
short i;
547547
i = ntohs(ip->tot_len) - hdrlen;
548548
thp->ack_seq = htonl( ntohl(thp->ack_seq) + i);
549549
thp->seq = htonl( ntohl(thp->seq) + i);
@@ -637,7 +637,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
637637
int
638638
slhc_remember(struct slcompress *comp, unsigned char *icp, int isize)
639639
{
640-
register struct cstate *cs;
640+
struct cstate *cs;
641641
unsigned ihl;
642642

643643
unsigned char index;

net/netfilter/ipvs/ip_vs_ctl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ static inline unsigned int
262262
ip_vs_svc_hashkey(struct netns_ipvs *ipvs, int af, unsigned int proto,
263263
const union nf_inet_addr *addr, __be16 port)
264264
{
265-
register unsigned int porth = ntohs(port);
265+
unsigned int porth = ntohs(port);
266266
__be32 addr_fold = addr->ip;
267267
__u32 ahash;
268268

@@ -493,7 +493,7 @@ static inline unsigned int ip_vs_rs_hashkey(int af,
493493
const union nf_inet_addr *addr,
494494
__be16 port)
495495
{
496-
register unsigned int porth = ntohs(port);
496+
unsigned int porth = ntohs(port);
497497
__be32 addr_fold = addr->ip;
498498

499499
#ifdef CONFIG_IP_VS_IPV6

net/netfilter/ipvs/ip_vs_lblcr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static void ip_vs_dest_set_eraseall(struct ip_vs_dest_set *set)
160160
/* get weighted least-connection node in the destination set */
161161
static inline struct ip_vs_dest *ip_vs_dest_set_min(struct ip_vs_dest_set *set)
162162
{
163-
register struct ip_vs_dest_set_elem *e;
163+
struct ip_vs_dest_set_elem *e;
164164
struct ip_vs_dest *dest, *least;
165165
int loh, doh;
166166

@@ -209,7 +209,7 @@ static inline struct ip_vs_dest *ip_vs_dest_set_min(struct ip_vs_dest_set *set)
209209
/* get weighted most-connection node in the destination set */
210210
static inline struct ip_vs_dest *ip_vs_dest_set_max(struct ip_vs_dest_set *set)
211211
{
212-
register struct ip_vs_dest_set_elem *e;
212+
struct ip_vs_dest_set_elem *e;
213213
struct ip_vs_dest *dest, *most;
214214
int moh, doh;
215215

0 commit comments

Comments
 (0)