summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@animalcreek.com>2014-09-02 15:12:39 -0700
committerSamuel Ortiz <sameo@linux.intel.com>2014-09-07 23:13:45 +0200
commit307e5caf6fb1dac1b9cfa1d78138d77e46517b56 (patch)
treea20c2bf2391edbd25779c0cb5564741dd94f4bf4 /drivers/nfc
parent4e007f810664541078e619d050f6290bf137aa61 (diff)
downloadop-kernel-dev-307e5caf6fb1dac1b9cfa1d78138d77e46517b56.zip
op-kernel-dev-307e5caf6fb1dac1b9cfa1d78138d77e46517b56.tar.gz
NFC: trf7970a: Add '_in_' to initiator routines
Rename trf7970a_config_rf_tech() and trf7970a_config_framing() to trf7970a_in_config_rf_tech() and trf7970a_in_config_framing(), respectively to avoid confusion when target support is added. Signed-off-by: Mark A. Greer <mgreer@animalcreek.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/trf7970a.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c
index b2d0fbf..e4671e5 100644
--- a/drivers/nfc/trf7970a.c
+++ b/drivers/nfc/trf7970a.c
@@ -941,7 +941,7 @@ static int trf7970a_switch_rf(struct nfc_digital_dev *ddev, bool on)
return ret;
}
-static int trf7970a_config_rf_tech(struct trf7970a *trf, int tech)
+static int trf7970a_in_config_rf_tech(struct trf7970a *trf, int tech)
{
int ret = 0;
@@ -983,7 +983,7 @@ static int trf7970a_config_rf_tech(struct trf7970a *trf, int tech)
return ret;
}
-static int trf7970a_config_framing(struct trf7970a *trf, int framing)
+static int trf7970a_in_config_framing(struct trf7970a *trf, int framing)
{
u8 iso_ctrl = trf->iso_ctrl_tech;
int ret;
@@ -1065,10 +1065,10 @@ static int trf7970a_in_configure_hw(struct nfc_digital_dev *ddev, int type,
switch (type) {
case NFC_DIGITAL_CONFIG_RF_TECH:
- ret = trf7970a_config_rf_tech(trf, param);
+ ret = trf7970a_in_config_rf_tech(trf, param);
break;
case NFC_DIGITAL_CONFIG_FRAMING:
- ret = trf7970a_config_framing(trf, param);
+ ret = trf7970a_in_config_framing(trf, param);
break;
default:
dev_dbg(trf->dev, "Unknown type: %d\n", type);
OpenPOWER on IntegriCloud