[patch 1/2] bluetooth: Make hci_sock_cleanup() return void

[patch 1/2] bluetooth: Make hci_sock_cleanup() return void

[akpm]

From: Tobias Klauser <tklauser@distanz.ch>

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>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Dave Young <hidave.darkstar@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/net/bluetooth/bluetooth.h |    2 +-
 net/bluetooth/hci_sock.c          |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff -puN include/net/bluetooth/bluetooth.h~bluetooth-make-hci_sock_cleanup-return-void include/net/bluetooth/bluetooth.h
--- a/include/net/bluetooth/bluetooth.h~bluetooth-make-hci_sock_cleanup-return-void
+++ a/include/net/bluetooth/bluetooth.h
@@ -170,7 +170,7 @@ static inline int skb_frags_no(struct sk
 int bt_err(__u16 code);
 
 extern int hci_sock_init(void);
-extern int hci_sock_cleanup(void);
+extern void hci_sock_cleanup(void);
 
 extern int bt_sysfs_init(void);
 extern void bt_sysfs_cleanup(void);
diff -puN net/bluetooth/hci_sock.c~bluetooth-make-hci_sock_cleanup-return-void net/bluetooth/hci_sock.c
--- a/net/bluetooth/hci_sock.c~bluetooth-make-hci_sock_cleanup-return-void
+++ a/net/bluetooth/hci_sock.c
@@ -734,7 +734,7 @@ error:
 	return err;
 }
 
-int __exit hci_sock_cleanup(void)
+void __exit hci_sock_cleanup(void)
 {
 	if (bt_sock_unregister(BTPROTO_HCI) < 0)
 		BT_ERR("HCI socket unregistration failed");
@@ -742,6 +742,4 @@ int __exit hci_sock_cleanup(void)
 	hci_unregister_notifier(&hci_sock_nblock);
 
 	proto_unregister(&hci_sk_proto);
-
-	return 0;
 }
_

Re: [patch 1/2] bluetooth: Make hci_sock_cleanup() return void

[Marcel Holtmann]

Hi Andrew,

> From: Tobias Klauser <tklauser@distanz.ch>
>
> 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>
> Cc: Marcel Holtmann <marcel@holtmann.org>
> Cc: Dave Young <hidave.darkstar@gmail.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Acked-by: Marcel Holtmann <marcel@holtmann.org>

Dave, I can queue these up if you don't wanna grab them into netdev  
tree by yourself.

Regards

Marcel

Re: [patch 1/2] bluetooth: Make hci_sock_cleanup() return void

[David Miller]

From: Marcel Holtmann <marcel@holtmann.org>
Date: Wed, 5 Mar 2008 09:50:39 +0100

> Dave, I can queue these up if you don't wanna grab them into netdev  
> tree by yourself.

I'll take care of it, thanks.

Re: [patch 1/2] bluetooth: Make hci_sock_cleanup() return void

[David Miller]

From: akpm@linux-foundation.org
Date: Tue, 04 Mar 2008 15:18:22 -0800

> From: Tobias Klauser <tklauser@distanz.ch>
> 
> 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>
> Cc: Marcel Holtmann <marcel@holtmann.org>
> Cc: Dave Young <hidave.darkstar@gmail.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Applied.