diff options
author | Szymon Janc <szymon.janc@tieto.com> | 2012-10-17 09:23:39 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-10-26 12:26:52 -0400 |
commit | 0f450772224f99db3b8384bfb8f751889d0c4cb8 (patch) | |
tree | c2b0422af06a420d853aab206605e2bb86429afd /net/nfc/hci/core.c | |
parent | 7eda8b8e967781cfa5a04962502f9aa428f67e5f (diff) |
NFC: Fix some code style and whitespace issues
Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/hci/core.c')
-rw-r--r-- | net/nfc/hci/core.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c index 4b720ff20ee9..bc571b0efb92 100644 --- a/net/nfc/hci/core.c +++ b/net/nfc/hci/core.c | |||
@@ -65,8 +65,9 @@ static void nfc_hci_msg_tx_work(struct work_struct *work) | |||
65 | -ETIME); | 65 | -ETIME); |
66 | kfree(hdev->cmd_pending_msg); | 66 | kfree(hdev->cmd_pending_msg); |
67 | hdev->cmd_pending_msg = NULL; | 67 | hdev->cmd_pending_msg = NULL; |
68 | } else | 68 | } else { |
69 | goto exit; | 69 | goto exit; |
70 | } | ||
70 | } | 71 | } |
71 | 72 | ||
72 | next_msg: | 73 | next_msg: |
@@ -535,7 +536,8 @@ static int hci_start_poll(struct nfc_dev *nfc_dev, | |||
535 | return hdev->ops->start_poll(hdev, im_protocols, tm_protocols); | 536 | return hdev->ops->start_poll(hdev, im_protocols, tm_protocols); |
536 | else | 537 | else |
537 | return nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE, | 538 | return nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE, |
538 | NFC_HCI_EVT_READER_REQUESTED, NULL, 0); | 539 | NFC_HCI_EVT_READER_REQUESTED, |
540 | NULL, 0); | ||
539 | } | 541 | } |
540 | 542 | ||
541 | static void hci_stop_poll(struct nfc_dev *nfc_dev) | 543 | static void hci_stop_poll(struct nfc_dev *nfc_dev) |
@@ -639,9 +641,9 @@ static int hci_transceive(struct nfc_dev *nfc_dev, struct nfc_target *target, | |||
639 | cb_context); | 641 | cb_context); |
640 | if (r == 1) | 642 | if (r == 1) |
641 | r = -ENOTSUPP; | 643 | r = -ENOTSUPP; |
642 | } | 644 | } else { |
643 | else | ||
644 | r = -ENOTSUPP; | 645 | r = -ENOTSUPP; |
646 | } | ||
645 | break; | 647 | break; |
646 | } | 648 | } |
647 | 649 | ||
@@ -891,7 +893,7 @@ void nfc_hci_driver_failure(struct nfc_hci_dev *hdev, int err) | |||
891 | } | 893 | } |
892 | EXPORT_SYMBOL(nfc_hci_driver_failure); | 894 | EXPORT_SYMBOL(nfc_hci_driver_failure); |
893 | 895 | ||
894 | void inline nfc_hci_recv_frame(struct nfc_hci_dev *hdev, struct sk_buff *skb) | 896 | void nfc_hci_recv_frame(struct nfc_hci_dev *hdev, struct sk_buff *skb) |
895 | { | 897 | { |
896 | nfc_llc_rcv_from_drv(hdev->llc, skb); | 898 | nfc_llc_rcv_from_drv(hdev->llc, skb); |
897 | } | 899 | } |