diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2012-03-04 19:03:53 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-06 15:16:25 -0500 |
commit | 0a40acb24602783fcf6881f915659148aa9807d7 (patch) | |
tree | aad4a42c270c615fdc67f454f974794e8fcd2160 /net/nfc/rawsock.c | |
parent | 427a2eb1f568c9c5934a36105232c94553db9b69 (diff) |
NFC: Core code identation fixes
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/nfc/rawsock.c')
-rw-r--r-- | net/nfc/rawsock.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/nfc/rawsock.c b/net/nfc/rawsock.c index 5325439b0c60..5a839ceb2e82 100644 --- a/net/nfc/rawsock.c +++ b/net/nfc/rawsock.c | |||
@@ -63,7 +63,7 @@ static int rawsock_release(struct socket *sock) | |||
63 | } | 63 | } |
64 | 64 | ||
65 | static int rawsock_connect(struct socket *sock, struct sockaddr *_addr, | 65 | static int rawsock_connect(struct socket *sock, struct sockaddr *_addr, |
66 | int len, int flags) | 66 | int len, int flags) |
67 | { | 67 | { |
68 | struct sock *sk = sock->sk; | 68 | struct sock *sk = sock->sk; |
69 | struct sockaddr_nfc *addr = (struct sockaddr_nfc *)_addr; | 69 | struct sockaddr_nfc *addr = (struct sockaddr_nfc *)_addr; |
@@ -73,7 +73,7 @@ static int rawsock_connect(struct socket *sock, struct sockaddr *_addr, | |||
73 | pr_debug("sock=%p sk=%p flags=%d\n", sock, sk, flags); | 73 | pr_debug("sock=%p sk=%p flags=%d\n", sock, sk, flags); |
74 | 74 | ||
75 | if (!addr || len < sizeof(struct sockaddr_nfc) || | 75 | if (!addr || len < sizeof(struct sockaddr_nfc) || |
76 | addr->sa_family != AF_NFC) | 76 | addr->sa_family != AF_NFC) |
77 | return -EINVAL; | 77 | return -EINVAL; |
78 | 78 | ||
79 | pr_debug("addr dev_idx=%u target_idx=%u protocol=%u\n", | 79 | pr_debug("addr dev_idx=%u target_idx=%u protocol=%u\n", |
@@ -120,7 +120,7 @@ static int rawsock_add_header(struct sk_buff *skb) | |||
120 | } | 120 | } |
121 | 121 | ||
122 | static void rawsock_data_exchange_complete(void *context, struct sk_buff *skb, | 122 | static void rawsock_data_exchange_complete(void *context, struct sk_buff *skb, |
123 | int err) | 123 | int err) |
124 | { | 124 | { |
125 | struct sock *sk = (struct sock *) context; | 125 | struct sock *sk = (struct sock *) context; |
126 | 126 | ||
@@ -173,7 +173,7 @@ static void rawsock_tx_work(struct work_struct *work) | |||
173 | 173 | ||
174 | sock_hold(sk); | 174 | sock_hold(sk); |
175 | rc = nfc_data_exchange(dev, target_idx, skb, | 175 | rc = nfc_data_exchange(dev, target_idx, skb, |
176 | rawsock_data_exchange_complete, sk); | 176 | rawsock_data_exchange_complete, sk); |
177 | if (rc) { | 177 | if (rc) { |
178 | rawsock_report_error(sk, rc); | 178 | rawsock_report_error(sk, rc); |
179 | sock_put(sk); | 179 | sock_put(sk); |
@@ -181,7 +181,7 @@ static void rawsock_tx_work(struct work_struct *work) | |||
181 | } | 181 | } |
182 | 182 | ||
183 | static int rawsock_sendmsg(struct kiocb *iocb, struct socket *sock, | 183 | static int rawsock_sendmsg(struct kiocb *iocb, struct socket *sock, |
184 | struct msghdr *msg, size_t len) | 184 | struct msghdr *msg, size_t len) |
185 | { | 185 | { |
186 | struct sock *sk = sock->sk; | 186 | struct sock *sk = sock->sk; |
187 | struct nfc_dev *dev = nfc_rawsock(sk)->dev; | 187 | struct nfc_dev *dev = nfc_rawsock(sk)->dev; |
@@ -218,7 +218,7 @@ static int rawsock_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
218 | } | 218 | } |
219 | 219 | ||
220 | static int rawsock_recvmsg(struct kiocb *iocb, struct socket *sock, | 220 | static int rawsock_recvmsg(struct kiocb *iocb, struct socket *sock, |
221 | struct msghdr *msg, size_t len, int flags) | 221 | struct msghdr *msg, size_t len, int flags) |
222 | { | 222 | { |
223 | int noblock = flags & MSG_DONTWAIT; | 223 | int noblock = flags & MSG_DONTWAIT; |
224 | struct sock *sk = sock->sk; | 224 | struct sock *sk = sock->sk; |
@@ -274,7 +274,7 @@ static void rawsock_destruct(struct sock *sk) | |||
274 | 274 | ||
275 | if (sk->sk_state == TCP_ESTABLISHED) { | 275 | if (sk->sk_state == TCP_ESTABLISHED) { |
276 | nfc_deactivate_target(nfc_rawsock(sk)->dev, | 276 | nfc_deactivate_target(nfc_rawsock(sk)->dev, |
277 | nfc_rawsock(sk)->target_idx); | 277 | nfc_rawsock(sk)->target_idx); |
278 | nfc_put_device(nfc_rawsock(sk)->dev); | 278 | nfc_put_device(nfc_rawsock(sk)->dev); |
279 | } | 279 | } |
280 | 280 | ||
@@ -287,7 +287,7 @@ static void rawsock_destruct(struct sock *sk) | |||
287 | } | 287 | } |
288 | 288 | ||
289 | static int rawsock_create(struct net *net, struct socket *sock, | 289 | static int rawsock_create(struct net *net, struct socket *sock, |
290 | const struct nfc_protocol *nfc_proto) | 290 | const struct nfc_protocol *nfc_proto) |
291 | { | 291 | { |
292 | struct sock *sk; | 292 | struct sock *sk; |
293 | 293 | ||