Commit 30458aac authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz

nfc: st-nci: Fix typo when changing from st21nfcb to st-nci

Replace ST21NFCB with ST_NCI or st21nfcb with st_nci as it
was forgotten in commit "nfc: st-nci: Rename st21nfcb to st-nci"
ed06aeef

Cc: stable@vger.kernel.org
Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 76b733d1
...@@ -29,11 +29,11 @@ ...@@ -29,11 +29,11 @@
#include "ndlc.h" #include "ndlc.h"
#define DRIVER_DESC "NCI NFC driver for ST21NFCB" #define DRIVER_DESC "NCI NFC driver for ST_NCI"
/* ndlc header */ /* ndlc header */
#define ST21NFCB_FRAME_HEADROOM 1 #define ST_NCI_FRAME_HEADROOM 1
#define ST21NFCB_FRAME_TAILROOM 0 #define ST_NCI_FRAME_TAILROOM 0
#define ST_NCI_I2C_MIN_SIZE 4 /* PCB(1) + NCI Packet header(3) */ #define ST_NCI_I2C_MIN_SIZE 4 /* PCB(1) + NCI Packet header(3) */
#define ST_NCI_I2C_MAX_SIZE 250 /* req 4.2.1 */ #define ST_NCI_I2C_MAX_SIZE 250 /* req 4.2.1 */
...@@ -118,14 +118,14 @@ static int st_nci_i2c_write(void *phy_id, struct sk_buff *skb) ...@@ -118,14 +118,14 @@ static int st_nci_i2c_write(void *phy_id, struct sk_buff *skb)
/* /*
* Reads an ndlc frame and returns it in a newly allocated sk_buff. * Reads an ndlc frame and returns it in a newly allocated sk_buff.
* returns: * returns:
* frame size : if received frame is complete (find ST21NFCB_SOF_EOF at * frame size : if received frame is complete (find ST_NCI_SOF_EOF at
* end of read) * end of read)
* -EAGAIN : if received frame is incomplete (not find ST21NFCB_SOF_EOF * -EAGAIN : if received frame is incomplete (not find ST_NCI_SOF_EOF
* at end of read) * at end of read)
* -EREMOTEIO : i2c read error (fatal) * -EREMOTEIO : i2c read error (fatal)
* -EBADMSG : frame was incorrect and discarded * -EBADMSG : frame was incorrect and discarded
* (value returned from st_nci_i2c_repack) * (value returned from st_nci_i2c_repack)
* -EIO : if no ST21NFCB_SOF_EOF is found after reaching * -EIO : if no ST_NCI_SOF_EOF is found after reaching
* the read length end sequence * the read length end sequence
*/ */
static int st_nci_i2c_read(struct st_nci_i2c_phy *phy, static int st_nci_i2c_read(struct st_nci_i2c_phy *phy,
...@@ -179,7 +179,7 @@ static int st_nci_i2c_read(struct st_nci_i2c_phy *phy, ...@@ -179,7 +179,7 @@ static int st_nci_i2c_read(struct st_nci_i2c_phy *phy,
/* /*
* Reads an ndlc frame from the chip. * Reads an ndlc frame from the chip.
* *
* On ST21NFCB, IRQ goes in idle state when read starts. * On ST_NCI, IRQ goes in idle state when read starts.
*/ */
static irqreturn_t st_nci_irq_thread_fn(int irq, void *phy_id) static irqreturn_t st_nci_irq_thread_fn(int irq, void *phy_id)
{ {
...@@ -325,12 +325,12 @@ static int st_nci_i2c_probe(struct i2c_client *client, ...@@ -325,12 +325,12 @@ static int st_nci_i2c_probe(struct i2c_client *client,
} }
} else { } else {
nfc_err(&client->dev, nfc_err(&client->dev,
"st21nfcb platform resources not available\n"); "st_nci platform resources not available\n");
return -ENODEV; return -ENODEV;
} }
r = ndlc_probe(phy, &i2c_phy_ops, &client->dev, r = ndlc_probe(phy, &i2c_phy_ops, &client->dev,
ST21NFCB_FRAME_HEADROOM, ST21NFCB_FRAME_TAILROOM, ST_NCI_FRAME_HEADROOM, ST_NCI_FRAME_TAILROOM,
&phy->ndlc); &phy->ndlc);
if (r < 0) { if (r < 0) {
nfc_err(&client->dev, "Unable to register ndlc layer\n"); nfc_err(&client->dev, "Unable to register ndlc layer\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment