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>

diff --git a/net/atm/pvc.c b/net/atm/pvc.c
index 8d74e62b0d79f93e63cabde5474b0d9f13d4bd04..437ee70c5e629e3fcf8cbd4cdb3ac5f737802b23 100644 (file)
--- a/net/atm/pvc.c
+++ b/net/atm/pvc.c
@@ -17,32 +17,35 @@
 #include "common.h"            /* common for PVCs and SVCs */
 
 
-static int pvc_shutdown(struct socket *sock,int how)
+static int pvc_shutdown(struct socket *sock, int how)
 {
        return 0;
 }
 
-
-static int pvc_bind(struct socket *sock,struct sockaddr *sockaddr,
-    int sockaddr_len)
+static int pvc_bind(struct socket *sock, struct sockaddr *sockaddr,
+                   int sockaddr_len)
 {
        struct sock *sk = sock->sk;
        struct sockaddr_atmpvc *addr;
        struct atm_vcc *vcc;
        int error;
 
-       if (sockaddr_len != sizeof(struct sockaddr_atmpvc)) return -EINVAL;
-       addr = (struct sockaddr_atmpvc *) sockaddr;
-       if (addr->sap_family != AF_ATMPVC) return -EAFNOSUPPORT;
+       if (sockaddr_len != sizeof(struct sockaddr_atmpvc))
+               return -EINVAL;
+       addr = (struct sockaddr_atmpvc *)sockaddr;
+       if (addr->sap_family != AF_ATMPVC)
+               return -EAFNOSUPPORT;
        lock_sock(sk);
        vcc = ATM_SD(sock);
        if (!test_bit(ATM_VF_HASQOS, &vcc->flags)) {
                error = -EBADFD;
                goto out;
        }
-       if (test_bit(ATM_VF_PARTIAL,&vcc->flags)) {
-               if (vcc->vpi != ATM_VPI_UNSPEC) addr->sap_addr.vpi = vcc->vpi;
-               if (vcc->vci != ATM_VCI_UNSPEC) addr->sap_addr.vci = vcc->vci;
+       if (test_bit(ATM_VF_PARTIAL, &vcc->flags)) {
+               if (vcc->vpi != ATM_VPI_UNSPEC)
+                       addr->sap_addr.vpi = vcc->vpi;
+               if (vcc->vci != ATM_VCI_UNSPEC)
+                       addr->sap_addr.vci = vcc->vci;
        }
        error = vcc_connect(sock, addr->sap_addr.itf, addr->sap_addr.vpi,
                            addr->sap_addr.vci);
@@ -51,11 +54,10 @@ out:
        return error;
 }
 
-
-static int pvc_connect(struct socket *sock,struct sockaddr *sockaddr,
-    int sockaddr_len,int flags)
+static int pvc_connect(struct socket *sock, struct sockaddr *sockaddr,
+                      int sockaddr_len, int flags)
 {
-       return pvc_bind(sock,sockaddr,sockaddr_len);
+       return pvc_bind(sock, sockaddr, sockaddr_len);
 }
 
 static int pvc_setsockopt(struct socket *sock, int level, int optname,
@@ -70,7 +72,6 @@ static int pvc_setsockopt(struct socket *sock, int level, int optname,
        return error;
 }
 
-
 static int pvc_getsockopt(struct socket *sock, int level, int optname,
                          char __user *optval, int __user *optlen)
 {
@@ -83,16 +84,16 @@ static int pvc_getsockopt(struct socket *sock, int level, int optname,
        return error;
 }
 
-
-static int pvc_getname(struct socket *sock,struct sockaddr *sockaddr,
-    int *sockaddr_len,int peer)
+static int pvc_getname(struct socket *sock, struct sockaddr *sockaddr,
+                      int *sockaddr_len, int peer)
 {
        struct sockaddr_atmpvc *addr;
        struct atm_vcc *vcc = ATM_SD(sock);
 
-       if (!vcc->dev || !test_bit(ATM_VF_ADDR,&vcc->flags)) return -ENOTCONN;
+       if (!vcc->dev || !test_bit(ATM_VF_ADDR, &vcc->flags))
+               return -ENOTCONN;
        *sockaddr_len = sizeof(struct sockaddr_atmpvc);
-       addr = (struct sockaddr_atmpvc *) sockaddr;
+       addr = (struct sockaddr_atmpvc *)sockaddr;
        addr->sap_family = AF_ATMPVC;
        addr->sap_addr.itf = vcc->dev->number;
        addr->sap_addr.vpi = vcc->vpi;
@@ -100,7 +101,6 @@ static int pvc_getname(struct socket *sock,struct sockaddr *sockaddr,
        return 0;
 }
 
-
 static const struct proto_ops pvc_proto_ops = {
        .family =       PF_ATMPVC,
        .owner =        THIS_MODULE,
@@ -137,7 +137,6 @@ static int pvc_create(struct net *net, struct socket *sock, int protocol,
        return vcc_create(net, sock, protocol, PF_ATMPVC);
 }
 
-
 static const struct net_proto_family pvc_family_ops = {
        .family = PF_ATMPVC,
        .create = pvc_create,