summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/nfc
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/nfc')
-rw-r--r--kernel/drivers/nfc/st21nfcb/i2c.c10
-rw-r--r--kernel/drivers/nfc/st21nfcb/st21nfcb.c3
2 files changed, 0 insertions, 13 deletions
diff --git a/kernel/drivers/nfc/st21nfcb/i2c.c b/kernel/drivers/nfc/st21nfcb/i2c.c
index 76a4cad41..c44f8cf53 100644
--- a/kernel/drivers/nfc/st21nfcb/i2c.c
+++ b/kernel/drivers/nfc/st21nfcb/i2c.c
@@ -87,11 +87,6 @@ static void st21nfcb_nci_i2c_disable(void *phy_id)
gpio_set_value(phy->gpio_reset, 1);
}
-static void st21nfcb_nci_remove_header(struct sk_buff *skb)
-{
- skb_pull(skb, ST21NFCB_FRAME_HEADROOM);
-}
-
/*
* Writing a frame must not return the number of written bytes.
* It must return either zero for success, or <0 for error.
@@ -121,8 +116,6 @@ static int st21nfcb_nci_i2c_write(void *phy_id, struct sk_buff *skb)
r = 0;
}
- st21nfcb_nci_remove_header(skb);
-
return r;
}
@@ -366,9 +359,6 @@ static int st21nfcb_nci_i2c_remove(struct i2c_client *client)
ndlc_remove(phy->ndlc);
- if (phy->powered)
- st21nfcb_nci_i2c_disable(phy);
-
return 0;
}
diff --git a/kernel/drivers/nfc/st21nfcb/st21nfcb.c b/kernel/drivers/nfc/st21nfcb/st21nfcb.c
index ca9871ab3..c7dc282d5 100644
--- a/kernel/drivers/nfc/st21nfcb/st21nfcb.c
+++ b/kernel/drivers/nfc/st21nfcb/st21nfcb.c
@@ -131,11 +131,8 @@ EXPORT_SYMBOL_GPL(st21nfcb_nci_probe);
void st21nfcb_nci_remove(struct nci_dev *ndev)
{
- struct st21nfcb_nci_info *info = nci_get_drvdata(ndev);
-
nci_unregister_device(ndev);
nci_free_device(ndev);
- kfree(info);
}
EXPORT_SYMBOL_GPL(st21nfcb_nci_remove);