Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

NFC: st21nfca: Remove sporadic wait_tab variable from functions.

Browse source 
wait_tab variable is already global and may create conflicts.

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-04-01 00:34:03 +02:00 committed by Samuel Ortiz
parent e8efab6e6b
commit c5b0c370fc
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/nfc/st21nfca/i2c.c
View file

@ -100,17 +100,17 @@ do { \
static void st21nfca_hci_platform_init(struct st21nfca_i2c_phy *phy) static void st21nfca_hci_platform_init(struct st21nfca_i2c_phy *phy)
{ {
u16 wait_tab[] = { 50, 300, 1000 }; u16 wait_reboot[] = { 50, 300, 1000 };
char reboot_cmd[] = { 0x7E, 0x66, 0x48, 0xF6, 0x7E }; char reboot_cmd[] = { 0x7E, 0x66, 0x48, 0xF6, 0x7E };
u8 tmp[ST21NFCA_HCI_LLC_MAX_SIZE]; u8 tmp[ST21NFCA_HCI_LLC_MAX_SIZE];
int i, r = -1; int i, r = -1;
for (i = 0; i < ARRAY_SIZE(wait_tab) && r < 0; i++) for (i = 0; i < ARRAY_SIZE(wait_reboot) && r < 0; i++)
r = i2c_master_recv(phy->i2c_dev, tmp, r = i2c_master_recv(phy->i2c_dev, tmp,
ST21NFCA_HCI_LLC_MAX_SIZE); ST21NFCA_HCI_LLC_MAX_SIZE);
r = -1; r = -1;
for (i = 0; i < ARRAY_SIZE(wait_tab) && r < 0; i++) for (i = 0; i < ARRAY_SIZE(wait_reboot) && r < 0; i++)
r = i2c_master_send(phy->i2c_dev, reboot_cmd, r = i2c_master_send(phy->i2c_dev, reboot_cmd,
sizeof(reboot_cmd)); sizeof(reboot_cmd));
usleep_range(1000, 1500); usleep_range(1000, 1500);
@ -176,7 +176,6 @@ static int st21nfca_hci_i2c_write(void *phy_id, struct sk_buff *skb)
int r = -1, i, j, len; int r = -1, i, j, len;
struct st21nfca_i2c_phy *phy = phy_id; struct st21nfca_i2c_phy *phy = phy_id;
struct i2c_client *client = phy->i2c_dev; struct i2c_client *client = phy->i2c_dev;
u16 wait_tab[] = { 2, 3, 5, 15, 20, 40};
u8 tmp[ST21NFCA_HCI_LLC_MAX_SIZE * 2]; u8 tmp[ST21NFCA_HCI_LLC_MAX_SIZE * 2];
I2C_DUMP_SKB("st21nfca_hci_i2c_write", skb); I2C_DUMP_SKB("st21nfca_hci_i2c_write", skb);