openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFC: st21nfcb: few code clean up 

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Christophe Ricard 2014-05-25 22:46:58 +02:00 committed by Samuel Ortiz
parent bb15b2170c
commit fb92ff78f8
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/nfc/st21nfcb/i2c.c
View File

@ -164,11 +164,11 @@ static int st21nfcb_nci_i2c_read(struct st21nfcb_i2c_phy *phy,
u8 buf[ST21NFCB_NCI_I2C_MAX_SIZE]; u8 buf[ST21NFCB_NCI_I2C_MAX_SIZE];
struct i2c_client *client = phy->i2c_dev; struct i2c_client *client = phy->i2c_dev;
r = i2c_master_recv(client, buf, 4); r = i2c_master_recv(client, buf, ST21NFCB_NCI_I2C_MIN_SIZE);
if (r == -EREMOTEIO) { /* Retry, chip was in standby */ if (r == -EREMOTEIO) { /* Retry, chip was in standby */
usleep_range(1000, 4000); usleep_range(1000, 4000);
r = i2c_master_recv(client, buf, 4); r = i2c_master_recv(client, buf, ST21NFCB_NCI_I2C_MIN_SIZE);
} else if (r != 4) { } else if (r != ST21NFCB_NCI_I2C_MIN_SIZE) {
nfc_err(&client->dev, "cannot read ndlc & nci header\n"); nfc_err(&client->dev, "cannot read ndlc & nci header\n");
return -EREMOTEIO; return -EREMOTEIO;
} }
@ -179,13 +179,13 @@ static int st21nfcb_nci_i2c_read(struct st21nfcb_i2c_phy *phy,
return -EBADMSG; return -EBADMSG;
} }
*skb = alloc_skb(4 + len, GFP_KERNEL); *skb = alloc_skb(ST21NFCB_NCI_I2C_MIN_SIZE + len, GFP_KERNEL);
if (*skb == NULL) if (*skb == NULL)
return -ENOMEM; return -ENOMEM;
skb_reserve(*skb, 4); skb_reserve(*skb, ST21NFCB_NCI_I2C_MIN_SIZE);
skb_put(*skb, 4); skb_put(*skb, ST21NFCB_NCI_I2C_MIN_SIZE);
memcpy((*skb)->data, buf, 4); memcpy((*skb)->data, buf, ST21NFCB_NCI_I2C_MIN_SIZE);
if (!len) if (!len)
return 0; return 0;
@ -197,7 +197,7 @@ static int st21nfcb_nci_i2c_read(struct st21nfcb_i2c_phy *phy,
} }
skb_put(*skb, len); skb_put(*skb, len);
memcpy((*skb)->data + 4, buf, len); memcpy((*skb)->data + ST21NFCB_NCI_I2C_MIN_SIZE, buf, len);
I2C_DUMP_SKB("i2c frame read", *skb); I2C_DUMP_SKB("i2c frame read", *skb);

4
include/linux/platform_data/st21nfcb.h
View File

@ -16,8 +16,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _ST21NFCA_HCI_H_ #ifndef _ST21NFCB_NCI_H_
#define _ST21NFCA_HCI_H_ #define _ST21NFCB_NCI_H_
#include <linux/i2c.h> #include <linux/i2c.h>