diff options
author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-05-23 03:04:21 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-06-04 23:34:08 -0400 |
commit | 8fc9ced398824739d3c25c8aa7f6f34d8e7a49d9 (patch) | |
tree | 1ebdf750d6906ff4fc1f1752e8a392aeb9c1e24a /net/bluetooth/hci_sock.c | |
parent | c3c7ea65941a0b7a4f1b9655e7aaaab6ce1874d2 (diff) |
Bluetooth: Fix coding style in the subsystem
This is some leftover from the last patches that fixed style. It is mostly
line over 80 characters fixes reported by checkpatch.pl.
checkpatch.pl is clean for these files now.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_sock.c')
-rw-r--r-- | net/bluetooth/hci_sock.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index c1e0c3df5e6c..9d8e1c39955e 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c | |||
@@ -241,7 +241,8 @@ void hci_send_to_monitor(struct hci_dev *hdev, struct sk_buff *skb) | |||
241 | struct hci_mon_hdr *hdr; | 241 | struct hci_mon_hdr *hdr; |
242 | 242 | ||
243 | /* Create a private copy with headroom */ | 243 | /* Create a private copy with headroom */ |
244 | skb_copy = __pskb_copy(skb, HCI_MON_HDR_SIZE, GFP_ATOMIC); | 244 | skb_copy = __pskb_copy(skb, HCI_MON_HDR_SIZE, |
245 | GFP_ATOMIC); | ||
245 | if (!skb_copy) | 246 | if (!skb_copy) |
246 | continue; | 247 | continue; |
247 | 248 | ||
@@ -542,7 +543,8 @@ static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd, | |||
542 | } | 543 | } |
543 | } | 544 | } |
544 | 545 | ||
545 | static int hci_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | 546 | static int hci_sock_ioctl(struct socket *sock, unsigned int cmd, |
547 | unsigned long arg) | ||
546 | { | 548 | { |
547 | struct sock *sk = sock->sk; | 549 | struct sock *sk = sock->sk; |
548 | void __user *argp = (void __user *) arg; | 550 | void __user *argp = (void __user *) arg; |
@@ -603,7 +605,8 @@ static int hci_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long a | |||
603 | } | 605 | } |
604 | } | 606 | } |
605 | 607 | ||
606 | static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len) | 608 | static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, |
609 | int addr_len) | ||
607 | { | 610 | { |
608 | struct sockaddr_hci haddr; | 611 | struct sockaddr_hci haddr; |
609 | struct sock *sk = sock->sk; | 612 | struct sock *sk = sock->sk; |
@@ -692,7 +695,8 @@ done: | |||
692 | return err; | 695 | return err; |
693 | } | 696 | } |
694 | 697 | ||
695 | static int hci_sock_getname(struct socket *sock, struct sockaddr *addr, int *addr_len, int peer) | 698 | static int hci_sock_getname(struct socket *sock, struct sockaddr *addr, |
699 | int *addr_len, int peer) | ||
696 | { | 700 | { |
697 | struct sockaddr_hci *haddr = (struct sockaddr_hci *) addr; | 701 | struct sockaddr_hci *haddr = (struct sockaddr_hci *) addr; |
698 | struct sock *sk = sock->sk; | 702 | struct sock *sk = sock->sk; |
@@ -720,7 +724,8 @@ static void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, | |||
720 | 724 | ||
721 | if (mask & HCI_CMSG_DIR) { | 725 | if (mask & HCI_CMSG_DIR) { |
722 | int incoming = bt_cb(skb)->incoming; | 726 | int incoming = bt_cb(skb)->incoming; |
723 | put_cmsg(msg, SOL_HCI, HCI_CMSG_DIR, sizeof(incoming), &incoming); | 727 | put_cmsg(msg, SOL_HCI, HCI_CMSG_DIR, sizeof(incoming), |
728 | &incoming); | ||
724 | } | 729 | } |
725 | 730 | ||
726 | if (mask & HCI_CMSG_TSTAMP) { | 731 | if (mask & HCI_CMSG_TSTAMP) { |
@@ -895,7 +900,8 @@ drop: | |||
895 | goto done; | 900 | goto done; |
896 | } | 901 | } |
897 | 902 | ||
898 | static int hci_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int len) | 903 | static int hci_sock_setsockopt(struct socket *sock, int level, int optname, |
904 | char __user *optval, unsigned int len) | ||
899 | { | 905 | { |
900 | struct hci_ufilter uf = { .opcode = 0 }; | 906 | struct hci_ufilter uf = { .opcode = 0 }; |
901 | struct sock *sk = sock->sk; | 907 | struct sock *sk = sock->sk; |
@@ -977,7 +983,8 @@ done: | |||
977 | return err; | 983 | return err; |
978 | } | 984 | } |
979 | 985 | ||
980 | static int hci_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen) | 986 | static int hci_sock_getsockopt(struct socket *sock, int level, int optname, |
987 | char __user *optval, int __user *optlen) | ||
981 | { | 988 | { |
982 | struct hci_ufilter uf; | 989 | struct hci_ufilter uf; |
983 | struct sock *sk = sock->sk; | 990 | struct sock *sk = sock->sk; |