net: delete "register" keyword

Delete long obsoleted "register" keyword.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c
index c40daad515d57d9ad2bd7987719b70f1375745df..a58185b1d8bf762cc37261f777d1f968044c62ac 100644 (file)
--- a/drivers/net/ethernet/apple/bmac.c
+++ b/drivers/net/ethernet/apple/bmac.c
@@ -815,8 +815,8 @@ static int reverse6[64] = {
 static unsigned int
 crc416(unsigned int curval, unsigned short nxtval)
 {
-       register unsigned int counter, cur = curval, next = nxtval;
-       register int high_crc_set, low_data_set;
+       unsigned int counter, cur = curval, next = nxtval;
+       int high_crc_set, low_data_set;
 
        /* Swap bytes */
        next = ((next & 0x00FF) << 8) | (next >> 8);

diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
index ea90db3c77058b6a799245bd5a3ff9f672b5da5e..58a69f830d29bd507e5108e893d92bb8608ad8a3 100644 (file)
--- a/drivers/net/slip/slhc.c
+++ b/drivers/net/slip/slhc.c
@@ -91,8 +91,8 @@ static unsigned short pull16(unsigned char **cpp);
 struct slcompress *
 slhc_init(int rslots, int tslots)
 {
-       register short i;
-       register struct cstate *ts;
+       short i;
+       struct cstate *ts;
        struct slcompress *comp;
 
        if (rslots < 0 || rslots > 255 || tslots < 0 || tslots > 255)
@@ -206,7 +206,7 @@ pull16(unsigned char **cpp)
 static long
 decode(unsigned char **cpp)
 {
-       register int x;
+       int x;
 
        x = *(*cpp)++;
        if(x == 0){
@@ -227,14 +227,14 @@ int
 slhc_compress(struct slcompress *comp, unsigned char *icp, int isize,
        unsigned char *ocp, unsigned char **cpp, int compress_cid)
 {
-       register struct cstate *ocs = &(comp->tstate[comp->xmit_oldest]);
-       register struct cstate *lcs = ocs;
-       register struct cstate *cs = lcs->next;
-       register unsigned long deltaS, deltaA;
-       register short changes = 0;
+       struct cstate *ocs = &(comp->tstate[comp->xmit_oldest]);
+       struct cstate *lcs = ocs;
+       struct cstate *cs = lcs->next;
+       unsigned long deltaS, deltaA;
+       short changes = 0;
        int hlen;
        unsigned char new_seq[16];
-       register unsigned char *cp = new_seq;
+       unsigned char *cp = new_seq;
        struct iphdr *ip;
        struct tcphdr *th, *oth;
        __sum16 csum;
@@ -486,11 +486,11 @@ uncompressed:
 int
 slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
 {
-       register int changes;
+       int changes;
        long x;
-       register struct tcphdr *thp;
-       register struct iphdr *ip;
-       register struct cstate *cs;
+       struct tcphdr *thp;
+       struct iphdr *ip;
+       struct cstate *cs;
        int len, hdrlen;
        unsigned char *cp = icp;
 
@@ -543,7 +543,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
        switch(changes & SPECIALS_MASK){
        case SPECIAL_I:         /* Echoed terminal traffic */
                {
-               register short i;
+               short i;
                i = ntohs(ip->tot_len) - hdrlen;
                thp->ack_seq = htonl( ntohl(thp->ack_seq) + i);
                thp->seq = htonl( ntohl(thp->seq) + i);
@@ -637,7 +637,7 @@ bad:
 int
 slhc_remember(struct slcompress *comp, unsigned char *icp, int isize)
 {
-       register struct cstate *cs;
+       struct cstate *cs;
        unsigned ihl;
 
        unsigned char index;

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 060565e7d227a6b904941301aea2ba0c507d893b..145c8c9929273933ea8334174e86f7bcc64d4fe1 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -262,7 +262,7 @@ static inline unsigned int
 ip_vs_svc_hashkey(struct netns_ipvs *ipvs, int af, unsigned int proto,
                  const union nf_inet_addr *addr, __be16 port)
 {
-       register unsigned int porth = ntohs(port);
+       unsigned int porth = ntohs(port);
        __be32 addr_fold = addr->ip;
        __u32 ahash;
 
@@ -493,7 +493,7 @@ static inline unsigned int ip_vs_rs_hashkey(int af,
                                            const union nf_inet_addr *addr,
                                            __be16 port)
 {
-       register unsigned int porth = ntohs(port);
+       unsigned int porth = ntohs(port);
        __be32 addr_fold = addr->ip;
 
 #ifdef CONFIG_IP_VS_IPV6

diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
index c8b5a504476c908631dd217918380230cf10671f..77c323c36a889cde4c6ecfb3e6bc8b677d5bc72a 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_lblcr.c
+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
@@ -160,7 +160,7 @@ static void ip_vs_dest_set_eraseall(struct ip_vs_dest_set *set)
 /* get weighted least-connection node in the destination set */
 static inline struct ip_vs_dest *ip_vs_dest_set_min(struct ip_vs_dest_set *set)
 {
-       register struct ip_vs_dest_set_elem *e;
+       struct ip_vs_dest_set_elem *e;
        struct ip_vs_dest *dest, *least;
        int loh, doh;
 
@@ -209,7 +209,7 @@ static inline struct ip_vs_dest *ip_vs_dest_set_min(struct ip_vs_dest_set *set)
 /* get weighted most-connection node in the destination set */
 static inline struct ip_vs_dest *ip_vs_dest_set_max(struct ip_vs_dest_set *set)
 {
-       register struct ip_vs_dest_set_elem *e;
+       struct ip_vs_dest_set_elem *e;
        struct ip_vs_dest *dest, *most;
        int moh, doh;