linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johan Hedberg <johan.hedberg@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 09/18 v2] Bluetooth: Simplify hci_uart_tty_close logic
Date: Mon, 16 Jul 2012 16:12:10 +0300	[thread overview]
Message-ID: <1342444339-1627-9-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1342444339-1627-1-git-send-email-johan.hedberg@gmail.com>

From: Johan Hedberg <johan.hedberg@intel.com>

This patch cleans up and reduces indentation in the hci_uart_tty_close
function.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
 drivers/bluetooth/hci_ldisc.c |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 142f49c..b6d1f20 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -286,28 +286,29 @@ static int hci_uart_tty_open(struct tty_struct *tty)
 static void hci_uart_tty_close(struct tty_struct *tty)
 {
 	struct hci_uart *hu = (void *)tty->disc_data;
+	struct hci_dev *hdev;
 
 	BT_DBG("tty %p", tty);
 
 	/* Detach from the tty */
 	tty->disc_data = NULL;
 
-	if (hu) {
-		struct hci_dev *hdev = hu->hdev;
+	if (!hu)
+		return;
 
-		if (hdev)
-			hci_uart_close(hdev);
+	hdev = hu->hdev;
+	if (hdev)
+		hci_uart_close(hdev);
 
-		if (test_and_clear_bit(HCI_UART_PROTO_SET, &hu->flags)) {
-			if (hdev) {
-				hci_unregister_dev(hdev);
-				hci_free_dev(hdev);
-			}
-			hu->proto->close(hu);
+	if (test_and_clear_bit(HCI_UART_PROTO_SET, &hu->flags)) {
+		if (hdev) {
+			hci_unregister_dev(hdev);
+			hci_free_dev(hdev);
 		}
-
-		kfree(hu);
+		hu->proto->close(hu);
 	}
+
+	kfree(hu);
 }
 
 /* hci_uart_tty_wakeup()
-- 
1.7.10.4


  parent reply	other threads:[~2012-07-16 13:12 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-16 13:12 [PATCH 01/18 v2] Bluetooth: Initial skeleton for Three-wire UART (H5) support Johan Hedberg
2012-07-16 13:12 ` [PATCH 02/18 v2] Bluetooth: Add basic state tracking to Three-wire UART driver Johan Hedberg
2012-07-16 13:12 ` [PATCH 03/18 v2] Bluetooth: Add initial reliable packet support for Three-wire UART Johan Hedberg
2012-07-16 13:12 ` [PATCH 04/18 v2] Bluetooth: Add basic packet parsing to Three-wire UART driver Johan Hedberg
2012-07-16 13:12 ` [PATCH 05/18 v2] Bluetooth: Add initial packet sending support to Three-wire UART Johan Hedberg
2012-07-16 13:12 ` [PATCH 06/18 v2] Bluetooth: Add Three-wire header value convenience macros Johan Hedberg
2012-07-16 13:12 ` [PATCH 07/18 v2] Bluetooth: Fix/implement Three-wire reliable packet sending Johan Hedberg
2012-07-16 13:12 ` [PATCH 08/18 v2] Bluetooth: Add support for Three-wire Link Control packets Johan Hedberg
2012-07-16 13:12 ` Johan Hedberg [this message]
2012-07-16 13:12 ` [PATCH 10/18 v2] Bluetooth: Add delayed init sequence support for UART controllers Johan Hedberg
2012-07-16 13:12 ` [PATCH 11/18 v2] Bluetooth: Use delayed init for Three-wire UART Johan Hedberg
2012-07-16 13:12 ` [PATCH 12/18 v2] Bluetooth: Improve rx debug logs " Johan Hedberg
2012-07-16 13:12 ` [PATCH 13/18 v2] Bluetooth: Add initial sleep support to " Johan Hedberg
2012-07-16 13:12 ` [PATCH 14/18 v2] Bluetooth: Add initialization tracking to HCI Three-wire driver Johan Hedberg
2012-07-16 13:12 ` [PATCH 15/18 v2] Bluetooth: Implement proper low-power support for Three-wire UART Johan Hedberg
2012-07-16 13:12 ` [PATCH 16/18 v2] Bluetooth: Remove unnecessary h5_build_pkt function Johan Hedberg
2012-07-16 13:12 ` [PATCH 17/18 v2] Bluetooth: Improve Three-wire UART configuration handling Johan Hedberg
2012-07-16 13:12 ` [PATCH 18/18 v2] Bluetooth: Introduce a flags variable to Three-wire UART state Johan Hedberg
2012-07-17 17:51   ` Gustavo Padovan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1342444339-1627-9-git-send-email-johan.hedberg@gmail.com \
    --to=johan.hedberg@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).