Commit 6b6dd498f409463635c4f29a3a49585bc7e5d43e

Authored by Joe Perches
Committed by David S. Miller
1 parent 07367adbe5

net/atm/pvc.c: checkpatch cleanups

Spacing cleanups
Mostly 80 column wrapped.
Move trailing statements to new lines

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 21 additions and 22 deletions Side-by-side Diff

... ... @@ -17,32 +17,35 @@
17 17 #include "common.h" /* common for PVCs and SVCs */
18 18  
19 19  
20   -static int pvc_shutdown(struct socket *sock,int how)
  20 +static int pvc_shutdown(struct socket *sock, int how)
21 21 {
22 22 return 0;
23 23 }
24 24  
25   -
26   -static int pvc_bind(struct socket *sock,struct sockaddr *sockaddr,
27   - int sockaddr_len)
  25 +static int pvc_bind(struct socket *sock, struct sockaddr *sockaddr,
  26 + int sockaddr_len)
28 27 {
29 28 struct sock *sk = sock->sk;
30 29 struct sockaddr_atmpvc *addr;
31 30 struct atm_vcc *vcc;
32 31 int error;
33 32  
34   - if (sockaddr_len != sizeof(struct sockaddr_atmpvc)) return -EINVAL;
35   - addr = (struct sockaddr_atmpvc *) sockaddr;
36   - if (addr->sap_family != AF_ATMPVC) return -EAFNOSUPPORT;
  33 + if (sockaddr_len != sizeof(struct sockaddr_atmpvc))
  34 + return -EINVAL;
  35 + addr = (struct sockaddr_atmpvc *)sockaddr;
  36 + if (addr->sap_family != AF_ATMPVC)
  37 + return -EAFNOSUPPORT;
37 38 lock_sock(sk);
38 39 vcc = ATM_SD(sock);
39 40 if (!test_bit(ATM_VF_HASQOS, &vcc->flags)) {
40 41 error = -EBADFD;
41 42 goto out;
42 43 }
43   - if (test_bit(ATM_VF_PARTIAL,&vcc->flags)) {
44   - if (vcc->vpi != ATM_VPI_UNSPEC) addr->sap_addr.vpi = vcc->vpi;
45   - if (vcc->vci != ATM_VCI_UNSPEC) addr->sap_addr.vci = vcc->vci;
  44 + if (test_bit(ATM_VF_PARTIAL, &vcc->flags)) {
  45 + if (vcc->vpi != ATM_VPI_UNSPEC)
  46 + addr->sap_addr.vpi = vcc->vpi;
  47 + if (vcc->vci != ATM_VCI_UNSPEC)
  48 + addr->sap_addr.vci = vcc->vci;
46 49 }
47 50 error = vcc_connect(sock, addr->sap_addr.itf, addr->sap_addr.vpi,
48 51 addr->sap_addr.vci);
49 52  
... ... @@ -51,11 +54,10 @@
51 54 return error;
52 55 }
53 56  
54   -
55   -static int pvc_connect(struct socket *sock,struct sockaddr *sockaddr,
56   - int sockaddr_len,int flags)
  57 +static int pvc_connect(struct socket *sock, struct sockaddr *sockaddr,
  58 + int sockaddr_len, int flags)
57 59 {
58   - return pvc_bind(sock,sockaddr,sockaddr_len);
  60 + return pvc_bind(sock, sockaddr, sockaddr_len);
59 61 }
60 62  
61 63 static int pvc_setsockopt(struct socket *sock, int level, int optname,
... ... @@ -70,7 +72,6 @@
70 72 return error;
71 73 }
72 74  
73   -
74 75 static int pvc_getsockopt(struct socket *sock, int level, int optname,
75 76 char __user *optval, int __user *optlen)
76 77 {
77 78  
78 79  
... ... @@ -83,16 +84,16 @@
83 84 return error;
84 85 }
85 86  
86   -
87   -static int pvc_getname(struct socket *sock,struct sockaddr *sockaddr,
88   - int *sockaddr_len,int peer)
  87 +static int pvc_getname(struct socket *sock, struct sockaddr *sockaddr,
  88 + int *sockaddr_len, int peer)
89 89 {
90 90 struct sockaddr_atmpvc *addr;
91 91 struct atm_vcc *vcc = ATM_SD(sock);
92 92  
93   - if (!vcc->dev || !test_bit(ATM_VF_ADDR,&vcc->flags)) return -ENOTCONN;
  93 + if (!vcc->dev || !test_bit(ATM_VF_ADDR, &vcc->flags))
  94 + return -ENOTCONN;
94 95 *sockaddr_len = sizeof(struct sockaddr_atmpvc);
95   - addr = (struct sockaddr_atmpvc *) sockaddr;
  96 + addr = (struct sockaddr_atmpvc *)sockaddr;
96 97 addr->sap_family = AF_ATMPVC;
97 98 addr->sap_addr.itf = vcc->dev->number;
98 99 addr->sap_addr.vpi = vcc->vpi;
... ... @@ -100,7 +101,6 @@
100 101 return 0;
101 102 }
102 103  
103   -
104 104 static const struct proto_ops pvc_proto_ops = {
105 105 .family = PF_ATMPVC,
106 106 .owner = THIS_MODULE,
... ... @@ -136,7 +136,6 @@
136 136 sock->ops = &pvc_proto_ops;
137 137 return vcc_create(net, sock, protocol, PF_ATMPVC);
138 138 }
139   -
140 139  
141 140 static const struct net_proto_family pvc_family_ops = {
142 141 .family = PF_ATMPVC,