Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 04005dd9ae7bf1031408869c33df96149ebb1086

Authored by Tobias Klauser
Committed by David S. Miller
1 parent 147e2d5983
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

bluetooth: Make hci_sock_cleanup() return void 

hci_sock_cleanup() always returns 0 and its return value isn't used
anywhere in the code.

Compile-tested with 'make allyesconfig && make net/bluetooth/bluetooth.ko'

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>

Showing 2 changed files with 2 additions and 4 deletions Side-by-side Diff

include/net/bluetooth/bluetooth.h
Diff comments   View file @ 04005dd
... ... @@ -170,7 +170,7 @@
170 170 int bt_err(__u16 code);
171 171  
172 172 extern int hci_sock_init(void);
173   -extern int hci_sock_cleanup(void);
  173 +extern void hci_sock_cleanup(void);
174 174  
175 175 extern int bt_sysfs_init(void);
176 176 extern void bt_sysfs_cleanup(void);
net/bluetooth/hci_sock.c
Diff comments   View file @ 04005dd
... ... @@ -734,7 +734,7 @@
734 734 return err;
735 735 }
736 736  
737   -int __exit hci_sock_cleanup(void)
  737 +void __exit hci_sock_cleanup(void)
738 738 {
739 739 if (bt_sock_unregister(BTPROTO_HCI) < 0)
740 740 BT_ERR("HCI socket unregistration failed");
... ... @@ -742,7 +742,5 @@
742 742 hci_unregister_notifier(&hci_sock_nblock);
743 743  
744 744 proto_unregister(&hci_sk_proto);
745   -
746   - return 0;
747 745 }