diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2014-07-28 12:11:31 -0400 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-09-07 17:56:46 -0400 |
| commit | 3e6df9191abe9dc46b7f9f540e1c3c73cfaccedf (patch) | |
| tree | e08db05deaa86c57d5eb094a2c015d9a9f1bc04d | |
| parent | 6ae3ed1c52b9ce12e1b3d2ac8f648b7de1569dfe (diff) | |
NFC: st21nfca: Fix scripts/checkpatch.pl warnings "Missing a blank line after declarations"
Fixing scripts/checkpatch.pl warning "Missing a blank line after declarations" in:
- st21nfca.c:
- check_presence after fwi variable declaration.
- get_frame_size after len variable declaration.
- st21nfca_hci_i2c_repack after "i, j, r, size" variable declaration.
- st21nfca_dep.c st21nfca_tx_work after skb pointer declaration.
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| -rw-r--r-- | drivers/nfc/st21nfca/i2c.c | 2 | ||||
| -rw-r--r-- | drivers/nfc/st21nfca/st21nfca.c | 1 | ||||
| -rw-r--r-- | drivers/nfc/st21nfca/st21nfca_dep.c | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c index d7a2c7636e26..72ad36873bdf 100644 --- a/drivers/nfc/st21nfca/i2c.c +++ b/drivers/nfc/st21nfca/i2c.c | |||
| @@ -271,6 +271,7 @@ static int st21nfca_hci_i2c_write(void *phy_id, struct sk_buff *skb) | |||
| 271 | static int get_frame_size(u8 *buf, int buflen) | 271 | static int get_frame_size(u8 *buf, int buflen) |
| 272 | { | 272 | { |
| 273 | int len = 0; | 273 | int len = 0; |
| 274 | |||
| 274 | if (buf[len + 1] == ST21NFCA_SOF_EOF) | 275 | if (buf[len + 1] == ST21NFCA_SOF_EOF) |
| 275 | return 0; | 276 | return 0; |
| 276 | 277 | ||
| @@ -311,6 +312,7 @@ static int check_crc(u8 *buf, int buflen) | |||
| 311 | static int st21nfca_hci_i2c_repack(struct sk_buff *skb) | 312 | static int st21nfca_hci_i2c_repack(struct sk_buff *skb) |
| 312 | { | 313 | { |
| 313 | int i, j, r, size; | 314 | int i, j, r, size; |
| 315 | |||
| 314 | if (skb->len < 1 || (skb->len > 1 && skb->data[1] != 0)) | 316 | if (skb->len < 1 || (skb->len > 1 && skb->data[1] != 0)) |
| 315 | return -EBADMSG; | 317 | return -EBADMSG; |
| 316 | 318 | ||
diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c index 823be16b2510..b6ad8c902f8d 100644 --- a/drivers/nfc/st21nfca/st21nfca.c +++ b/drivers/nfc/st21nfca/st21nfca.c | |||
| @@ -790,6 +790,7 @@ static int st21nfca_hci_check_presence(struct nfc_hci_dev *hdev, | |||
| 790 | struct nfc_target *target) | 790 | struct nfc_target *target) |
| 791 | { | 791 | { |
| 792 | u8 fwi = 0x11; | 792 | u8 fwi = 0x11; |
| 793 | |||
| 793 | switch (target->hci_reader_gate) { | 794 | switch (target->hci_reader_gate) { |
| 794 | case NFC_HCI_RF_READER_A_GATE: | 795 | case NFC_HCI_RF_READER_A_GATE: |
| 795 | case NFC_HCI_RF_READER_B_GATE: | 796 | case NFC_HCI_RF_READER_B_GATE: |
diff --git a/drivers/nfc/st21nfca/st21nfca_dep.c b/drivers/nfc/st21nfca/st21nfca_dep.c index b2d9957b57f8..a62b6485cbbe 100644 --- a/drivers/nfc/st21nfca/st21nfca_dep.c +++ b/drivers/nfc/st21nfca/st21nfca_dep.c | |||
| @@ -121,6 +121,7 @@ static void st21nfca_tx_work(struct work_struct *work) | |||
| 121 | 121 | ||
| 122 | struct nfc_dev *dev; | 122 | struct nfc_dev *dev; |
| 123 | struct sk_buff *skb; | 123 | struct sk_buff *skb; |
| 124 | |||
| 124 | if (info) { | 125 | if (info) { |
| 125 | dev = info->hdev->ndev; | 126 | dev = info->hdev->ndev; |
| 126 | skb = info->dep_info.tx_pending; | 127 | skb = info->dep_info.tx_pending; |
