diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2008-03-05 21:47:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-05 21:47:03 -0500 |
| commit | 04005dd9ae7bf1031408869c33df96149ebb1086 (patch) | |
| tree | 07a729c5a58c27dcf0247aac66515ce48b3a98cc | |
| parent | 147e2d59833e994cc99341806a88b9e59be41391 (diff) | |
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>
| -rw-r--r-- | include/net/bluetooth/bluetooth.h | 2 | ||||
| -rw-r--r-- | net/bluetooth/hci_sock.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 771d17783c18..750648df13f4 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h | |||
| @@ -170,7 +170,7 @@ static inline int skb_frags_no(struct sk_buff *skb) | |||
| 170 | int bt_err(__u16 code); | 170 | int bt_err(__u16 code); |
| 171 | 171 | ||
| 172 | extern int hci_sock_init(void); | 172 | extern int hci_sock_init(void); |
| 173 | extern int hci_sock_cleanup(void); | 173 | extern void hci_sock_cleanup(void); |
| 174 | 174 | ||
| 175 | extern int bt_sysfs_init(void); | 175 | extern int bt_sysfs_init(void); |
| 176 | extern void bt_sysfs_cleanup(void); | 176 | extern void bt_sysfs_cleanup(void); |
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 14991323c273..b5d4019d3572 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c | |||
| @@ -734,7 +734,7 @@ error: | |||
| 734 | return err; | 734 | return err; |
| 735 | } | 735 | } |
| 736 | 736 | ||
| 737 | int __exit hci_sock_cleanup(void) | 737 | void __exit hci_sock_cleanup(void) |
| 738 | { | 738 | { |
| 739 | if (bt_sock_unregister(BTPROTO_HCI) < 0) | 739 | if (bt_sock_unregister(BTPROTO_HCI) < 0) |
| 740 | BT_ERR("HCI socket unregistration failed"); | 740 | BT_ERR("HCI socket unregistration failed"); |
| @@ -742,6 +742,4 @@ int __exit hci_sock_cleanup(void) | |||
| 742 | hci_unregister_notifier(&hci_sock_nblock); | 742 | hci_unregister_notifier(&hci_sock_nblock); |
| 743 | 743 | ||
| 744 | proto_unregister(&hci_sk_proto); | 744 | proto_unregister(&hci_sk_proto); |
| 745 | |||
| 746 | return 0; | ||
| 747 | } | 745 | } |
