Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f450772 authored by Szymon Janc's avatar Szymon Janc Committed by Samuel Ortiz
Browse files

NFC: Fix some code style and whitespace issues 



Signed-off-by: default avatarSzymon Janc <szymon.janc@tieto.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 7eda8b8e

net/nfc/hci/core.c

+7 −5
Original line number Diff line number Diff line
@@ -65,9 +65,10 @@ static void nfc_hci_msg_tx_work(struct work_struct *work) 
							  -ETIME);

			kfree(hdev->cmd_pending_msg);

			hdev->cmd_pending_msg = NULL;

		} else

		} else {

			goto exit;

		}

	}



next_msg:

	if (list_empty(&hdev->msg_tx_queue))
@@ -535,7 +536,8 @@ static int hci_start_poll(struct nfc_dev *nfc_dev, 
		return hdev->ops->start_poll(hdev, im_protocols, tm_protocols);

	else

		return nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE,

				       NFC_HCI_EVT_READER_REQUESTED, NULL, 0);

					  NFC_HCI_EVT_READER_REQUESTED,

					  NULL, 0);

}



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, 
						     cb_context);

			if (r == 1)

				r = -ENOTSUPP;

		}

		else

		} else {

			r = -ENOTSUPP;

		}

		break;

	}
@@ -891,7 +893,7 @@ void nfc_hci_driver_failure(struct nfc_hci_dev *hdev, int err) 
}

EXPORT_SYMBOL(nfc_hci_driver_failure);



void inline nfc_hci_recv_frame(struct nfc_hci_dev *hdev, struct sk_buff *skb)

void nfc_hci_recv_frame(struct nfc_hci_dev *hdev, struct sk_buff *skb)

{

	nfc_llc_rcv_from_drv(hdev->llc, skb);

}

net/nfc/hci/llc_shdlc.c

+3 −4
Original line number Diff line number Diff line
@@ -634,9 +634,9 @@ static void llc_shdlc_sm_work(struct work_struct *work) 
			r = llc_shdlc_connect_initiate(shdlc);

		else

			r = -ETIME;

		if (r < 0)

		if (r < 0) {

			llc_shdlc_connect_complete(shdlc, r);

		else {

		} else {

			mod_timer(&shdlc->connect_timer, jiffies +

				  msecs_to_jiffies(SHDLC_CONNECT_VALUE_MS));
@@ -682,9 +682,8 @@ static void llc_shdlc_sm_work(struct work_struct *work) 
			llc_shdlc_handle_send_queue(shdlc);

		}



		if (shdlc->hard_fault) {

		if (shdlc->hard_fault)

			shdlc->llc_failure(shdlc->hdev, shdlc->hard_fault);

		}

		break;

	default:

		break;

net/nfc/llcp/llcp.c

+4 −3
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ static void nfc_llcp_socket_release(struct nfc_llcp_local *local, bool listen) 
			struct nfc_llcp_sock *lsk, *n;

			struct sock *accept_sk;



			list_for_each_entry_safe(lsk, n, &llcp_sock->accept_queue,

			list_for_each_entry_safe(lsk, n,

						 &llcp_sock->accept_queue,

						 accept_queue) {

				accept_sk = &lsk->sk;

				bh_lock_sock(accept_sk);

net/nfc/nci/core.c

+0 −1
Original line number Diff line number Diff line
@@ -577,7 +577,6 @@ static void nci_deactivate_target(struct nfc_dev *nfc_dev, 
	}

}





static int nci_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target,

			   __u8 comm_mode, __u8 *gb, size_t gb_len)

{

net/nfc/rawsock.c

+0 −1
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ static int rawsock_recvmsg(struct kiocb *iocb, struct socket *sock, 
	return rc ? : copied;

}





static const struct proto_ops rawsock_ops = {

	.family         = PF_NFC,

	.owner          = THIS_MODULE,

net/nfc/hci/llc.c

+1 −1

File changed.

Contains only whitespace changes.

net/nfc/netlink.c

+1 −1

File changed.

Contains only whitespace changes.

net/nfc/core.c

+1 −1

File changed.

Contains only whitespace changes.