From: Waldemar Rymarkiewicz Date: Wed, 3 Apr 2013 06:02:02 +0000 (+0200) Subject: NFC: pn533: Rename pn533_fw_reset appropriately X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f75c291361fc646d42cd62d8ebfbdecaa13077cc;p=deliverable%2Flinux.git NFC: pn533: Rename pn533_fw_reset appropriately Define explicitely it is Pasori specific reset command. Signed-off-by: Waldemar Rymarkiewicz Signed-off-by: Samuel Ortiz --- 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; }