Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5a9d0a3ffbc40ea1f5a0636501e7599cbb327bcc

Authored by Waldemar Rymarkiewicz
Committed by Gustavo F. Padovan
1 parent d29d04ce0f
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Bluetooth: Clean up some code style issues 

Fix lines longer than 80 chars in length.

Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

Showing 3 changed files with 35 additions and 19 deletions Side-by-side Diff

include/net/bluetooth/bluetooth.h
Diff comments   View file @ 5a9d0a3
... ... @@ -137,7 +137,8 @@
137 137 int bt_sock_unregister(int proto);
138 138 void bt_sock_link(struct bt_sock_list *l, struct sock *s);
139 139 void bt_sock_unlink(struct bt_sock_list *l, struct sock *s);
140   -int bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len, int flags);
  140 +int bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
  141 + struct msghdr *msg, size_t len, int flags);
141 142 int bt_sock_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
142 143 struct msghdr *msg, size_t len, int flags);
143 144 uint bt_sock_poll(struct file * file, struct socket *sock, poll_table *wait);
... ... @@ -172,8 +173,8 @@
172 173 return skb;
173 174 }
174 175  
175   -static inline struct sk_buff *bt_skb_send_alloc(struct sock *sk, unsigned long len,
176   - int nb, int *err)
  176 +static inline struct sk_buff *bt_skb_send_alloc(struct sock *sk,
  177 + unsigned long len, int nb, int *err)
177 178 {
178 179 struct sk_buff *skb;
179 180  
include/net/bluetooth/hci_core.h
Diff comments   View file @ 5a9d0a3
... ... @@ -224,7 +224,7 @@
224 224 spinlock_t lock;
225 225  
226 226 bdaddr_t dst;
227   - __u8 dst_type;
  227 + __u8 dst_type;
228 228 __u16 handle;
229 229 __u16 state;
230 230 __u8 mode;
... ... @@ -317,7 +317,8 @@
317 317 return jiffies - e->timestamp;
318 318 }
319 319  
320   -struct inquiry_entry *hci_inquiry_cache_lookup(struct hci_dev *hdev, bdaddr_t *bdaddr);
  320 +struct inquiry_entry *hci_inquiry_cache_lookup(struct hci_dev *hdev,
  321 + bdaddr_t *bdaddr);
321 322 void hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data);
322 323  
323 324 /* ----- HCI Connections ----- */
... ... @@ -431,7 +432,8 @@
431 432 void hci_conn_hash_flush(struct hci_dev *hdev);
432 433 void hci_conn_check_pending(struct hci_dev *hdev);
433 434  
434   -struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8 sec_level, __u8 auth_type);
  435 +struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,
  436 + __u8 sec_level, __u8 auth_type);
435 437 int hci_conn_check_link_mode(struct hci_conn *conn);
436 438 int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level);
437 439 int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type);
438 440  
439 441  
... ... @@ -460,10 +462,12 @@
460 462 timeo = msecs_to_jiffies(conn->disc_timeout);
461 463 if (!conn->out)
462 464 timeo *= 2;
463   - } else
  465 + } else {
464 466 timeo = msecs_to_jiffies(10);
465   - } else
  467 + }
  468 + } else {
466 469 timeo = msecs_to_jiffies(10);
  470 + }
467 471 mod_timer(&conn->disc_timer, jiffies + timeo);
468 472 }
469 473 }
470 474  
471 475  
472 476  
... ... @@ -578,16 +582,20 @@
578 582  
579 583 void *priv;
580 584  
581   - int (*connect_ind) (struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 type);
  585 + int (*connect_ind) (struct hci_dev *hdev, bdaddr_t *bdaddr,
  586 + __u8 type);
582 587 int (*connect_cfm) (struct hci_conn *conn, __u8 status);
583 588 int (*disconn_ind) (struct hci_conn *conn);
584 589 int (*disconn_cfm) (struct hci_conn *conn, __u8 reason);
585   - int (*recv_acldata) (struct hci_conn *conn, struct sk_buff *skb, __u16 flags);
  590 + int (*recv_acldata) (struct hci_conn *conn, struct sk_buff *skb,
  591 + __u16 flags);
586 592 int (*recv_scodata) (struct hci_conn *conn, struct sk_buff *skb);
587   - int (*security_cfm) (struct hci_conn *conn, __u8 status, __u8 encrypt);
  593 + int (*security_cfm) (struct hci_conn *conn, __u8 status,
  594 + __u8 encrypt);
588 595 };
589 596  
590   -static inline int hci_proto_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 type)
  597 +static inline int hci_proto_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr,
  598 + __u8 type)
591 599 {
592 600 register struct hci_proto *hp;
593 601 int mask = 0;
... ... @@ -673,7 +681,8 @@
673 681 conn->security_cfm_cb(conn, status);
674 682 }
675 683  
676   -static inline void hci_proto_encrypt_cfm(struct hci_conn *conn, __u8 status, __u8 encrypt)
  684 +static inline void hci_proto_encrypt_cfm(struct hci_conn *conn, __u8 status,
  685 + __u8 encrypt)
677 686 {
678 687 register struct hci_proto *hp;
679 688  
... ... @@ -698,7 +707,8 @@
698 707  
699 708 char *name;
700 709  
701   - void (*security_cfm) (struct hci_conn *conn, __u8 status, __u8 encrypt);
  710 + void (*security_cfm) (struct hci_conn *conn, __u8 status,
  711 + __u8 encrypt);
702 712 void (*key_change_cfm) (struct hci_conn *conn, __u8 status);
703 713 void (*role_switch_cfm) (struct hci_conn *conn, __u8 status, __u8 role);
704 714 };
... ... @@ -724,7 +734,8 @@
724 734 read_unlock_bh(&hci_cb_list_lock);
725 735 }
726 736  
727   -static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status, __u8 encrypt)
  737 +static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,
  738 + __u8 encrypt)
728 739 {
729 740 struct list_head *p;
730 741  
... ... @@ -755,7 +766,8 @@
755 766 read_unlock_bh(&hci_cb_list_lock);
756 767 }
757 768  
758   -static inline void hci_role_switch_cfm(struct hci_conn *conn, __u8 status, __u8 role)
  769 +static inline void hci_role_switch_cfm(struct hci_conn *conn, __u8 status,
  770 + __u8 role)
759 771 {
760 772 struct list_head *p;
761 773  
include/net/bluetooth/rfcomm.h
Diff comments   View file @ 5a9d0a3
... ... @@ -234,7 +234,8 @@
234 234 /* ---- RFCOMM DLCs (channels) ---- */
235 235 struct rfcomm_dlc *rfcomm_dlc_alloc(gfp_t prio);
236 236 void rfcomm_dlc_free(struct rfcomm_dlc *d);
237   -int rfcomm_dlc_open(struct rfcomm_dlc *d, bdaddr_t *src, bdaddr_t *dst, u8 channel);
  237 +int rfcomm_dlc_open(struct rfcomm_dlc *d, bdaddr_t *src, bdaddr_t *dst,
  238 + u8 channel);
238 239 int rfcomm_dlc_close(struct rfcomm_dlc *d, int reason);
239 240 int rfcomm_dlc_send(struct rfcomm_dlc *d, struct sk_buff *skb);
240 241 int rfcomm_dlc_set_modem_status(struct rfcomm_dlc *d, u8 v24_sig);
... ... @@ -271,7 +272,8 @@
271 272 }
272 273  
273 274 /* ---- RFCOMM sessions ---- */
274   -void rfcomm_session_getaddr(struct rfcomm_session *s, bdaddr_t *src, bdaddr_t *dst);
  275 +void rfcomm_session_getaddr(struct rfcomm_session *s, bdaddr_t *src,
  276 + bdaddr_t *dst);
275 277  
276 278 static inline void rfcomm_session_hold(struct rfcomm_session *s)
277 279 {
... ... @@ -312,7 +314,8 @@
312 314 int rfcomm_init_sockets(void);
313 315 void rfcomm_cleanup_sockets(void);
314 316  
315   -int rfcomm_connect_ind(struct rfcomm_session *s, u8 channel, struct rfcomm_dlc **d);
  317 +int rfcomm_connect_ind(struct rfcomm_session *s, u8 channel,
  318 + struct rfcomm_dlc **d);
316 319  
317 320 /* ---- RFCOMM TTY ---- */
318 321 #define RFCOMM_MAX_DEV 256