devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christophe Ricard <christophe.ricard-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org
Cc: linux-nfc-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org,
	christophe-h.ricard-qxv4g6HH51o@public.gmane.org,
	christophe.ricard-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH v2 29/35] nfc: st-nci: Add few code style fixes
Date: Sun, 25 Oct 2015 22:54:44 +0100	[thread overview]
Message-ID: <1445810090-18403-30-git-send-email-christophe-h.ricard@st.com> (raw)
In-Reply-To: <1445810090-18403-1-git-send-email-christophe-h.ricard-qxv4g6HH51o@public.gmane.org>

Add some few code style fixes.

Cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Signed-off-by: Christophe Ricard <christophe-h.ricard-qxv4g6HH51o@public.gmane.org>
---
 drivers/nfc/st-nci/i2c.c | 2 +-
 drivers/nfc/st-nci/se.c  | 2 +-
 net/nfc/nci/hci.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c
index 172cbc3..2a96f1a 100644
--- a/drivers/nfc/st-nci/i2c.c
+++ b/drivers/nfc/st-nci/i2c.c
@@ -32,7 +32,7 @@
 #define DRIVER_DESC "NCI NFC driver for ST_NCI"
 
 /* ndlc header */
-#define ST_NCI_FRAME_HEADROOM	1
+#define ST_NCI_FRAME_HEADROOM 1
 #define ST_NCI_FRAME_TAILROOM 0
 
 #define ST_NCI_I2C_MIN_SIZE 4   /* PCB(1) + NCI Packet header(3) */
diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c
index 1cc24b6..dbab722 100644
--- a/drivers/nfc/st-nci/se.c
+++ b/drivers/nfc/st-nci/se.c
@@ -62,7 +62,7 @@ struct st_nci_pipe_info {
 
 #define ST_NCI_EVT_SE_HARD_RESET		0x20
 #define ST_NCI_EVT_TRANSMIT_DATA		0x10
-#define ST_NCI_EVT_WTX_REQUEST		0x11
+#define ST_NCI_EVT_WTX_REQUEST			0x11
 #define ST_NCI_EVT_SE_SOFT_RESET		0x11
 #define ST_NCI_EVT_SE_END_OF_APDU_TRANSFER	0x21
 #define ST_NCI_EVT_HOT_PLUG			0x03
diff --git a/net/nfc/nci/hci.c b/net/nfc/nci/hci.c
index 1d6aa5d..984d451 100644
--- a/net/nfc/nci/hci.c
+++ b/net/nfc/nci/hci.c
@@ -405,7 +405,7 @@ static void nci_hci_hcp_message_rx(struct nci_dev *ndev, u8 pipe,
 		break;
 	}
 
-	nci_req_complete(ndev, 0);
+	nci_req_complete(ndev, NCI_STATUS_OK);
 }
 
 static void nci_hci_msg_rx_work(struct work_struct *work)
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2015-10-25 21:54 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-25 21:54 [PATCH v2 00/35] Few fixes and st21nfca/st-nci vendor_cmds support Christophe Ricard
2015-10-25 21:54 ` [PATCH v2 04/35] nfc: st-nci: Fix incorrect spi buffer size Christophe Ricard
2015-10-25 21:54 ` [PATCH v2 05/35] nfc: nci: Fix incorrect data chaining when sending data Christophe Ricard
2015-10-25 21:54 ` [PATCH v2 06/35] nfc: nci: Fix improper management of HCI return code Christophe Ricard
2015-10-25 21:54 ` [PATCH v2 07/35] nfc: nci: extract pipe value using NCI_HCP_MSG_GET_PIPE Christophe Ricard
2015-10-25 21:54 ` [PATCH v2 11/35] nfc: st-nci: Remove ndev->hci_dev->init_data.gates initialization in load_session Christophe Ricard
2015-10-25 21:54 ` [PATCH v2 12/35] nfc: st21nfca: Remove hdev->init_data.gates " Christophe Ricard
2015-10-25 21:54 ` [PATCH v2 14/35] nfc: st21nfca: Open NFC_HCI_LINK_MGMT_PIPE Christophe Ricard
2015-10-25 21:54 ` [PATCH v2 16/35] nfc: st21nfca: Keep st21nfca_gates unchanged in load_session Christophe Ricard
2015-10-25 21:54 ` [PATCH v2 19/35] nfc: st-nci: Change st_nci_gates offset when looking for a pipe in the table Christophe Ricard
2015-10-25 21:54 ` [PATCH v2 20/35] nfc: st21nfca: Change st21nfca_gates " Christophe Ricard
2015-10-25 21:54 ` [PATCH v2 27/35] nfc: st21nfca: Fix host_list verification after secure element activation Christophe Ricard
     [not found] ` <1445810090-18403-1-git-send-email-christophe-h.ricard-qxv4g6HH51o@public.gmane.org>
2015-10-25 21:54   ` [PATCH v2 01/35] nfc: st-nci: Align st-nci driver with other nfc driver Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 02/35] nfc: st-nci: include st-nci.h instead of ndlc.h Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 03/35] nfc: st21nfca: Align st21nfca driver with other nfc driver Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 08/35] nfc: nci: add nci_hci_clear_all_pipes functions Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 09/35] nfc: nci: Add a call to nci_hci_clear_all_pipes at HCI initial activation Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 10/35] nfc: nci: add capability to create pipe on specific gate in nci_hci_connect_gate Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 13/35] nfc: st-nci: Open NCI_HCI_LINK_MGMT_PIPE Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 15/35] nfc: st-nci: Keep st_nci_gates unchanged in load_session Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 17/35] nfc: st-nci: initialize gate_count in st_nci_hci_network_init Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 18/35] nfc: st-nci: Add support for NCI_HCI_IDENTITY_MGMT_GATE Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 21/35] nfc: st-nci: Add support for proprietary commands for factory tests Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 22/35] nfc: st-nci: Add error messages when an unexpected HCI event occurs Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 23/35] nfc: netlink: Add missing NFC_ATTR comments Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 24/35] nfc: st-nci: Add ese-present/uicc-present dts properties Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 25/35] nfc: st-nci: Increase waiting time between 2 secure element activation Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 26/35] nfc: st-nci: Fix host_list verification after " Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 28/35] nfc: netlink: Add mode parameter to deactivate_target functions Christophe Ricard
2015-10-25 21:54   ` Christophe Ricard [this message]
2015-10-25 21:54   ` [PATCH v2 30/35] nfc: st21nfca: Add few code style fixes Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 31/35] nfc: st21nfca: Add support for proprietary commands for factory tests Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 32/35] nfc: st21nfca: Add error messages when an unexpected HCI event occurs Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 33/35] nfc: st-nci: Make sure irq is not already active when powering the device Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 34/35] nfc: st-nci: remove duplicated skb dump Christophe Ricard
2015-10-25 21:54   ` [PATCH v2 35/35] nfc: st-nci: Replace st21nfcb by st_nci in makefile Christophe Ricard
2015-10-26  6:01   ` [PATCH v2 00/35] Few fixes and st21nfca/st-nci vendor_cmds support Samuel Ortiz
     [not found]     ` <20151026060133.GA24619-nKCvNrh56OoJmsy6czSMtA@public.gmane.org>
2015-10-26  6:41       ` Christophe Ricard
     [not found]         ` <562DCB2D.3090503-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-10-27  3:48           ` Samuel Ortiz
     [not found]             ` <20151027034831.GA16135-nKCvNrh56OoJmsy6czSMtA@public.gmane.org>
2015-10-27  3:51               ` [linux-nfc] " Samuel Ortiz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1445810090-18403-30-git-send-email-christophe-h.ricard@st.com \
    --to=christophe.ricard-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=christophe-h.ricard-qxv4g6HH51o@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-nfc-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org \
    --cc=sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org \
    --cc=stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).