summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>2013-04-03 08:02:02 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2013-04-11 16:29:01 +0200
commitf75c291361fc646d42cd62d8ebfbdecaa13077cc (patch)
tree3418207ac43007061fac2f66ac8dcbeab4d31dae /drivers/nfc
parente70b96e95b61fcf7b1c85bc4e4db1f9478e3d2ff (diff)
downloadlinux-f75c291361fc646d42cd62d8ebfbdecaa13077cc.tar.gz
linux-f75c291361fc646d42cd62d8ebfbdecaa13077cc.tar.bz2
linux-f75c291361fc646d42cd62d8ebfbdecaa13077cc.zip
NFC: pn533: Rename pn533_fw_reset appropriately
Define explicitely it is Pasori specific reset command. Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/pn533.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index b193ae6998e4..24ffbe04108b 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -2314,7 +2314,7 @@ static int pn533_get_firmware_version(struct pn533 *dev,
return 0;
}
-static int pn533_fw_reset(struct pn533 *dev)
+static int pn533_pasori_fw_reset(struct pn533 *dev)
{
struct sk_buff *skb;
struct sk_buff *resp;
@@ -2409,7 +2409,7 @@ static int pn533_setup(struct pn533 *dev)
break;
case PN533_DEVICE_PASORI:
- pn533_fw_reset(dev);
+ pn533_pasori_fw_reset(dev);
rc = pn533_set_configuration(dev, PN533_CFGITEM_PASORI,
pasori_cfg, 3);
@@ -2419,7 +2419,7 @@ static int pn533_setup(struct pn533 *dev)
return rc;
}
- pn533_fw_reset(dev);
+ pn533_pasori_fw_reset(dev);
break;
}