aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>2013-04-03 02:02:02 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2013-04-11 10:29:01 -0400
commitf75c291361fc646d42cd62d8ebfbdecaa13077cc (patch)
tree3418207ac43007061fac2f66ac8dcbeab4d31dae
parente70b96e95b61fcf7b1c85bc4e4db1f9478e3d2ff (diff)
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>
-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,
2314 return 0; 2314 return 0;
2315} 2315}
2316 2316
2317static int pn533_fw_reset(struct pn533 *dev) 2317static int pn533_pasori_fw_reset(struct pn533 *dev)
2318{ 2318{
2319 struct sk_buff *skb; 2319 struct sk_buff *skb;
2320 struct sk_buff *resp; 2320 struct sk_buff *resp;
@@ -2409,7 +2409,7 @@ static int pn533_setup(struct pn533 *dev)
2409 break; 2409 break;
2410 2410
2411 case PN533_DEVICE_PASORI: 2411 case PN533_DEVICE_PASORI:
2412 pn533_fw_reset(dev); 2412 pn533_pasori_fw_reset(dev);
2413 2413
2414 rc = pn533_set_configuration(dev, PN533_CFGITEM_PASORI, 2414 rc = pn533_set_configuration(dev, PN533_CFGITEM_PASORI,
2415 pasori_cfg, 3); 2415 pasori_cfg, 3);
@@ -2419,7 +2419,7 @@ static int pn533_setup(struct pn533 *dev)
2419 return rc; 2419 return rc;
2420 } 2420 }
2421 2421
2422 pn533_fw_reset(dev); 2422 pn533_pasori_fw_reset(dev);
2423 2423
2424 break; 2424 break;
2425 } 2425 }