NFC: Core code identation fixes

[deliverable/linux.git] / net / nfc / rawsock.c

diff --git a/net/nfc/rawsock.c b/net/nfc/rawsock.c
index ee7b2b365ef2225e7bf6f4d2f71b0a03edfb7888..5a839ceb2e82f1f23e45595ae836526b9589fefd 100644 (file)
--- a/net/nfc/rawsock.c
+++ b/net/nfc/rawsock.c
@@ -21,6 +21,8 @@
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__
+
 #include <net/tcp_states.h>
 #include <linux/nfc.h>
 #include <linux/export.h>
@@ -29,7 +31,7 @@
 
 static void rawsock_write_queue_purge(struct sock *sk)
 {
-       nfc_dbg("sk=%p", sk);
+       pr_debug("sk=%p\n", sk);
 
        spin_lock_bh(&sk->sk_write_queue.lock);
        __skb_queue_purge(&sk->sk_write_queue);
@@ -39,7 +41,7 @@ static void rawsock_write_queue_purge(struct sock *sk)
 
 static void rawsock_report_error(struct sock *sk, int err)
 {
-       nfc_dbg("sk=%p err=%d", sk, err);
+       pr_debug("sk=%p err=%d\n", sk, err);
 
        sk->sk_shutdown = SHUTDOWN_MASK;
        sk->sk_err = -err;
@@ -52,7 +54,7 @@ static int rawsock_release(struct socket *sock)
 {
        struct sock *sk = sock->sk;
 
-       nfc_dbg("sock=%p", sock);
+       pr_debug("sock=%p\n", sock);
 
        sock_orphan(sk);
        sock_put(sk);
@@ -61,21 +63,21 @@ static int rawsock_release(struct socket *sock)
 }
 
 static int rawsock_connect(struct socket *sock, struct sockaddr *_addr,
-                                                       int len, int flags)
+                          int len, int flags)
 {
        struct sock *sk = sock->sk;
        struct sockaddr_nfc *addr = (struct sockaddr_nfc *)_addr;
        struct nfc_dev *dev;
        int rc = 0;
 
-       nfc_dbg("sock=%p sk=%p flags=%d", sock, sk, flags);
+       pr_debug("sock=%p sk=%p flags=%d\n", sock, sk, flags);
 
        if (!addr || len < sizeof(struct sockaddr_nfc) ||
-               addr->sa_family != AF_NFC)
+           addr->sa_family != AF_NFC)
                return -EINVAL;
 
-       nfc_dbg("addr dev_idx=%u target_idx=%u protocol=%u", addr->dev_idx,
-                                       addr->target_idx, addr->nfc_protocol);
+       pr_debug("addr dev_idx=%u target_idx=%u protocol=%u\n",
+                addr->dev_idx, addr->target_idx, addr->nfc_protocol);
 
        lock_sock(sk);
 
@@ -90,18 +92,6 @@ static int rawsock_connect(struct socket *sock, struct sockaddr *_addr,
                goto error;
        }
 
-       if (addr->target_idx > dev->target_idx - 1 ||
-               addr->target_idx < dev->target_idx - dev->n_targets) {
-               rc = -EINVAL;
-               goto error;
-       }
-
-       if (addr->target_idx > dev->target_idx - 1 ||
-               addr->target_idx < dev->target_idx - dev->n_targets) {
-               rc = -EINVAL;
-               goto error;
-       }
-
        rc = nfc_activate_target(dev, addr->target_idx, addr->nfc_protocol);
        if (rc)
                goto put_dev;
@@ -130,13 +120,13 @@ static int rawsock_add_header(struct sk_buff *skb)
 }
 
 static void rawsock_data_exchange_complete(void *context, struct sk_buff *skb,
-                                                               int err)
+                                          int err)
 {
        struct sock *sk = (struct sock *) context;
 
        BUG_ON(in_irq());
 
-       nfc_dbg("sk=%p err=%d", sk, err);
+       pr_debug("sk=%p err=%d\n", sk, err);
 
        if (err)
                goto error;
@@ -172,7 +162,7 @@ static void rawsock_tx_work(struct work_struct *work)
        struct sk_buff *skb;
        int rc;
 
-       nfc_dbg("sk=%p target_idx=%u", sk, target_idx);
+       pr_debug("sk=%p target_idx=%u\n", sk, target_idx);
 
        if (sk->sk_shutdown & SEND_SHUTDOWN) {
                rawsock_write_queue_purge(sk);
@@ -183,7 +173,7 @@ static void rawsock_tx_work(struct work_struct *work)
 
        sock_hold(sk);
        rc = nfc_data_exchange(dev, target_idx, skb,
-                               rawsock_data_exchange_complete, sk);
+                              rawsock_data_exchange_complete, sk);
        if (rc) {
                rawsock_report_error(sk, rc);
                sock_put(sk);
@@ -191,14 +181,14 @@ static void rawsock_tx_work(struct work_struct *work)
 }
 
 static int rawsock_sendmsg(struct kiocb *iocb, struct socket *sock,
-                                       struct msghdr *msg, size_t len)
+                          struct msghdr *msg, size_t len)
 {
        struct sock *sk = sock->sk;
        struct nfc_dev *dev = nfc_rawsock(sk)->dev;
        struct sk_buff *skb;
        int rc;
 
-       nfc_dbg("sock=%p sk=%p len=%zu", sock, sk, len);
+       pr_debug("sock=%p sk=%p len=%zu\n", sock, sk, len);
 
        if (msg->msg_namelen)
                return -EOPNOTSUPP;
@@ -206,13 +196,10 @@ static int rawsock_sendmsg(struct kiocb *iocb, struct socket *sock,
        if (sock->state != SS_CONNECTED)
                return -ENOTCONN;
 
-       skb = sock_alloc_send_skb(sk, len + dev->tx_headroom + dev->tx_tailroom + NFC_HEADER_SIZE,
-                                       msg->msg_flags & MSG_DONTWAIT, &rc);
-       if (!skb)
+       skb = nfc_alloc_send_skb(dev, sk, msg->msg_flags, len, &rc);
+       if (skb == NULL)
                return rc;
 
-       skb_reserve(skb, dev->tx_headroom + NFC_HEADER_SIZE);
-
        rc = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);
        if (rc < 0) {
                kfree_skb(skb);
@@ -231,7 +218,7 @@ static int rawsock_sendmsg(struct kiocb *iocb, struct socket *sock,
 }
 
 static int rawsock_recvmsg(struct kiocb *iocb, struct socket *sock,
-                               struct msghdr *msg, size_t len, int flags)
+                          struct msghdr *msg, size_t len, int flags)
 {
        int noblock = flags & MSG_DONTWAIT;
        struct sock *sk = sock->sk;
@@ -239,7 +226,7 @@ static int rawsock_recvmsg(struct kiocb *iocb, struct socket *sock,
        int copied;
        int rc;
 
-       nfc_dbg("sock=%p sk=%p len=%zu flags=%d", sock, sk, len, flags);
+       pr_debug("sock=%p sk=%p len=%zu flags=%d\n", sock, sk, len, flags);
 
        skb = skb_recv_datagram(sk, flags, noblock, &rc);
        if (!skb)
@@ -283,35 +270,35 @@ static const struct proto_ops rawsock_ops = {
 
 static void rawsock_destruct(struct sock *sk)
 {
-       nfc_dbg("sk=%p", sk);
+       pr_debug("sk=%p\n", sk);
 
        if (sk->sk_state == TCP_ESTABLISHED) {
                nfc_deactivate_target(nfc_rawsock(sk)->dev,
-                                       nfc_rawsock(sk)->target_idx);
+                                     nfc_rawsock(sk)->target_idx);
                nfc_put_device(nfc_rawsock(sk)->dev);
        }
 
        skb_queue_purge(&sk->sk_receive_queue);
 
        if (!sock_flag(sk, SOCK_DEAD)) {
-               nfc_err("Freeing alive NFC raw socket %p", sk);
+               pr_err("Freeing alive NFC raw socket %p\n", sk);
                return;
        }
 }
 
 static int rawsock_create(struct net *net, struct socket *sock,
-                               const struct nfc_protocol *nfc_proto)
+                         const struct nfc_protocol *nfc_proto)
 {
        struct sock *sk;
 
-       nfc_dbg("sock=%p", sock);
+       pr_debug("sock=%p\n", sock);
 
        if (sock->type != SOCK_SEQPACKET)
                return -ESOCKTNOSUPPORT;
 
        sock->ops = &rawsock_ops;
 
-       sk = sk_alloc(net, PF_NFC, GFP_KERNEL, nfc_proto->proto);
+       sk = sk_alloc(net, PF_NFC, GFP_ATOMIC, nfc_proto->proto);
        if (!sk)
                return -ENOMEM;