aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2012-02-29 22:37:10 -0500
committerGustavo F. Padovan <padovan@profusion.mobi>2012-02-29 23:27:54 -0500
commit00abfe4442864144a77f70b6b411d691bcb796bf (patch)
tree2a1029a6ea9aa06573c6fd149c3fcb02620a6716
parent53bf2426b4122d933213bba78bf736e88f7dc929 (diff)
Bluetooth: Fix coding style with breaking lines
Our limit is 80 and broken lines should as right as possible. Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
-rw-r--r--drivers/bluetooth/btmrvl_debugfs.c19
-rw-r--r--net/bluetooth/hci_event.c3
-rw-r--r--net/bluetooth/mgmt.c3
3 files changed, 12 insertions, 13 deletions
diff --git a/drivers/bluetooth/btmrvl_debugfs.c b/drivers/bluetooth/btmrvl_debugfs.c
index 60fe333cfd40..3497347e6dbb 100644
--- a/drivers/bluetooth/btmrvl_debugfs.c
+++ b/drivers/bluetooth/btmrvl_debugfs.c
@@ -401,28 +401,27 @@ void btmrvl_debugfs_init(struct hci_dev *hdev)
401 dbg->config_dir = debugfs_create_dir("config", hdev->debugfs); 401 dbg->config_dir = debugfs_create_dir("config", hdev->debugfs);
402 402
403 dbg->psmode = debugfs_create_file("psmode", 0644, dbg->config_dir, 403 dbg->psmode = debugfs_create_file("psmode", 0644, dbg->config_dir,
404 priv, &btmrvl_psmode_fops); 404 priv, &btmrvl_psmode_fops);
405 dbg->pscmd = debugfs_create_file("pscmd", 0644, dbg->config_dir, 405 dbg->pscmd = debugfs_create_file("pscmd", 0644, dbg->config_dir,
406 priv, &btmrvl_pscmd_fops); 406 priv, &btmrvl_pscmd_fops);
407 dbg->gpiogap = debugfs_create_file("gpiogap", 0644, dbg->config_dir, 407 dbg->gpiogap = debugfs_create_file("gpiogap", 0644, dbg->config_dir,
408 priv, &btmrvl_gpiogap_fops); 408 priv, &btmrvl_gpiogap_fops);
409 dbg->hsmode = debugfs_create_file("hsmode", 0644, dbg->config_dir, 409 dbg->hsmode = debugfs_create_file("hsmode", 0644, dbg->config_dir,
410 priv, &btmrvl_hsmode_fops); 410 priv, &btmrvl_hsmode_fops);
411 dbg->hscmd = debugfs_create_file("hscmd", 0644, dbg->config_dir, 411 dbg->hscmd = debugfs_create_file("hscmd", 0644, dbg->config_dir,
412 priv, &btmrvl_hscmd_fops); 412 priv, &btmrvl_hscmd_fops);
413 dbg->hscfgcmd = debugfs_create_file("hscfgcmd", 0644, dbg->config_dir, 413 dbg->hscfgcmd = debugfs_create_file("hscfgcmd", 0644, dbg->config_dir,
414 priv, &btmrvl_hscfgcmd_fops); 414 priv, &btmrvl_hscfgcmd_fops);
415 415
416 dbg->status_dir = debugfs_create_dir("status", hdev->debugfs); 416 dbg->status_dir = debugfs_create_dir("status", hdev->debugfs);
417 dbg->curpsmode = debugfs_create_file("curpsmode", 0444, 417 dbg->curpsmode = debugfs_create_file("curpsmode", 0444,
418 dbg->status_dir, priv, &btmrvl_curpsmode_fops); 418 dbg->status_dir, priv, &btmrvl_curpsmode_fops);
419 dbg->psstate = debugfs_create_file("psstate", 0444, dbg->status_dir, 419 dbg->psstate = debugfs_create_file("psstate", 0444, dbg->status_dir,
420 priv, &btmrvl_psstate_fops); 420 priv, &btmrvl_psstate_fops);
421 dbg->hsstate = debugfs_create_file("hsstate", 0444, dbg->status_dir, 421 dbg->hsstate = debugfs_create_file("hsstate", 0444, dbg->status_dir,
422 priv, &btmrvl_hsstate_fops); 422 priv, &btmrvl_hsstate_fops);
423 dbg->txdnldready = debugfs_create_file("txdnldready", 0444, 423 dbg->txdnldready = debugfs_create_file("txdnldready", 0444,
424 dbg->status_dir, 424 dbg->status_dir, priv,
425 priv,
426 &btmrvl_txdnldready_fops); 425 &btmrvl_txdnldready_fops);
427} 426}
428 427
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 746f7d372258..aee9556e1039 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1344,7 +1344,8 @@ static int hci_outgoing_auth_needed(struct hci_dev *hdev,
1344 return 1; 1344 return 1;
1345} 1345}
1346 1346
1347static inline int hci_resolve_name(struct hci_dev *hdev, struct inquiry_entry *e) 1347static inline int hci_resolve_name(struct hci_dev *hdev,
1348 struct inquiry_entry *e)
1348{ 1349{
1349 struct hci_cp_remote_name_req cp; 1350 struct hci_cp_remote_name_req cp;
1350 1351
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index b0c43fe43563..373b46a9eb17 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1926,8 +1926,7 @@ static int pin_code_reply(struct sock *sk, u16 index, void *data, u16 len)
1926 goto failed; 1926 goto failed;
1927 } 1927 }
1928 1928
1929 cmd = mgmt_pending_add(sk, MGMT_OP_PIN_CODE_REPLY, hdev, data, 1929 cmd = mgmt_pending_add(sk, MGMT_OP_PIN_CODE_REPLY, hdev, data, len);
1930 len);
1931 if (!cmd) { 1930 if (!cmd) {
1932 err = -ENOMEM; 1931 err = -ENOMEM;
1933 goto failed; 1932 goto failed;