From 59f1944db823719889277fcde4b76525844f1da3 Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Thu, 1 Mar 2012 00:37:10 -0300
Subject: [PATCH] --- yaml --- r: 291079 b: refs/heads/master c:
 00abfe4442864144a77f70b6b411d691bcb796bf h: refs/heads/master i:   291077:
 15b33da2a19090d0bb05e3aeafd8e2efef8ec79a   291075:
 d688367b82f942616bda100697347a24367d4d9c   291071:
 3645cf7bfd0a15cabc12e89bc4e298322c925cb4 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/bluetooth/btmrvl_debugfs.c | 19 +++++++++----------
 trunk/net/bluetooth/hci_event.c          |  3 ++-
 trunk/net/bluetooth/mgmt.c               |  3 +--
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 2016e63c6f7c..ff04078a39dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53bf2426b4122d933213bba78bf736e88f7dc929
+refs/heads/master: 00abfe4442864144a77f70b6b411d691bcb796bf
diff --git a/trunk/drivers/bluetooth/btmrvl_debugfs.c b/trunk/drivers/bluetooth/btmrvl_debugfs.c
index 60fe333cfd40..3497347e6dbb 100644
--- a/trunk/drivers/bluetooth/btmrvl_debugfs.c
+++ b/trunk/drivers/bluetooth/btmrvl_debugfs.c
@@ -401,28 +401,27 @@ void btmrvl_debugfs_init(struct hci_dev *hdev)
 	dbg->config_dir = debugfs_create_dir("config", hdev->debugfs);
 
 	dbg->psmode = debugfs_create_file("psmode", 0644, dbg->config_dir,
-				priv, &btmrvl_psmode_fops);
+						priv, &btmrvl_psmode_fops);
 	dbg->pscmd = debugfs_create_file("pscmd", 0644, dbg->config_dir,
-				priv, &btmrvl_pscmd_fops);
+						priv, &btmrvl_pscmd_fops);
 	dbg->gpiogap = debugfs_create_file("gpiogap", 0644, dbg->config_dir,
-				priv, &btmrvl_gpiogap_fops);
+						priv, &btmrvl_gpiogap_fops);
 	dbg->hsmode =  debugfs_create_file("hsmode", 0644, dbg->config_dir,
-				priv, &btmrvl_hsmode_fops);
+						priv, &btmrvl_hsmode_fops);
 	dbg->hscmd = debugfs_create_file("hscmd", 0644, dbg->config_dir,
-				priv, &btmrvl_hscmd_fops);
+						priv, &btmrvl_hscmd_fops);
 	dbg->hscfgcmd = debugfs_create_file("hscfgcmd", 0644, dbg->config_dir,
-				priv, &btmrvl_hscfgcmd_fops);
+						priv, &btmrvl_hscfgcmd_fops);
 
 	dbg->status_dir = debugfs_create_dir("status", hdev->debugfs);
 	dbg->curpsmode = debugfs_create_file("curpsmode", 0444,
 				dbg->status_dir, priv, &btmrvl_curpsmode_fops);
 	dbg->psstate = debugfs_create_file("psstate", 0444, dbg->status_dir,
-				priv, &btmrvl_psstate_fops);
+						priv, &btmrvl_psstate_fops);
 	dbg->hsstate = debugfs_create_file("hsstate", 0444, dbg->status_dir,
-				priv, &btmrvl_hsstate_fops);
+						priv, &btmrvl_hsstate_fops);
 	dbg->txdnldready = debugfs_create_file("txdnldready", 0444,
-						dbg->status_dir,
-						priv,
+						dbg->status_dir, priv,
 						&btmrvl_txdnldready_fops);
 }
 
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
index 746f7d372258..aee9556e1039 100644
--- a/trunk/net/bluetooth/hci_event.c
+++ b/trunk/net/bluetooth/hci_event.c
@@ -1344,7 +1344,8 @@ static int hci_outgoing_auth_needed(struct hci_dev *hdev,
 	return 1;
 }
 
-static inline int hci_resolve_name(struct hci_dev *hdev, struct inquiry_entry *e)
+static inline int hci_resolve_name(struct hci_dev *hdev,
+						struct inquiry_entry *e)
 {
 	struct hci_cp_remote_name_req cp;
 
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index b0c43fe43563..373b46a9eb17 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -1926,8 +1926,7 @@ static int pin_code_reply(struct sock *sk, u16 index, void *data, u16 len)
 		goto failed;
 	}
 
-	cmd = mgmt_pending_add(sk, MGMT_OP_PIN_CODE_REPLY, hdev, data,
-									len);
+	cmd = mgmt_pending_add(sk, MGMT_OP_PIN_CODE_REPLY, hdev, data, len);
 	if (!cmd) {
 		err = -ENOMEM;
 		goto failed;