From: Geert Uytterhoeven <geert@linux-m68k.org>
To: "Mark A. Greer" <mgreer@animalcreek.com>,
Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-wireless@vger.kernel.org, linux-nfc@ml01.01.org,
linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH] NFC: trf7970a: Move trf7970a_init inside #ifdef CONFIG_PM_RUNTIME
Date: Mon, 16 Jun 2014 15:06:13 +0200 [thread overview]
Message-ID: <1402923973-24316-1-git-send-email-geert@linux-m68k.org> (raw)
If CONFIG_PM_RUNTIME=n:
drivers/nfc/trf7970a.c:755: warning: ‘trf7970a_init’ defined but not used
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
drivers/nfc/trf7970a.c | 80 +++++++++++++++++++++++++-------------------------
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c
index 3b78b031e617..41a153ecc6ed 100644
--- a/drivers/nfc/trf7970a.c
+++ b/drivers/nfc/trf7970a.c
@@ -751,45 +751,6 @@ static void trf7970a_timeout_work_handler(struct work_struct *work)
mutex_unlock(&trf->lock);
}
-static int trf7970a_init(struct trf7970a *trf)
-{
- int ret;
-
- dev_dbg(trf->dev, "Initializing device - state: %d\n", trf->state);
-
- ret = trf7970a_cmd(trf, TRF7970A_CMD_SOFT_INIT);
- if (ret)
- goto err_out;
-
- ret = trf7970a_cmd(trf, TRF7970A_CMD_IDLE);
- if (ret)
- goto err_out;
-
- /* Must clear NFC Target Detection Level reg due to erratum */
- ret = trf7970a_write(trf, TRF7970A_NFC_TARGET_LEVEL, 0);
- if (ret)
- goto err_out;
-
- ret = trf7970a_write(trf, TRF7970A_ADJUTABLE_FIFO_IRQ_LEVELS,
- TRF7970A_ADJUTABLE_FIFO_IRQ_LEVELS_WLH_96 |
- TRF7970A_ADJUTABLE_FIFO_IRQ_LEVELS_WLL_32);
- if (ret)
- goto err_out;
-
- ret = trf7970a_write(trf, TRF7970A_SPECIAL_FCN_REG1, 0);
- if (ret)
- goto err_out;
-
- trf->special_fcn_reg1 = 0;
-
- trf->iso_ctrl = 0xff;
- return 0;
-
-err_out:
- dev_dbg(trf->dev, "Couldn't init device: %d\n", ret);
- return ret;
-}
-
static void trf7970a_switch_rf_off(struct trf7970a *trf)
{
dev_dbg(trf->dev, "Switching rf off\n");
@@ -1430,6 +1391,45 @@ static int trf7970a_pm_runtime_suspend(struct device *dev)
return ret;
}
+static int trf7970a_init(struct trf7970a *trf)
+{
+ int ret;
+
+ dev_dbg(trf->dev, "Initializing device - state: %d\n", trf->state);
+
+ ret = trf7970a_cmd(trf, TRF7970A_CMD_SOFT_INIT);
+ if (ret)
+ goto err_out;
+
+ ret = trf7970a_cmd(trf, TRF7970A_CMD_IDLE);
+ if (ret)
+ goto err_out;
+
+ /* Must clear NFC Target Detection Level reg due to erratum */
+ ret = trf7970a_write(trf, TRF7970A_NFC_TARGET_LEVEL, 0);
+ if (ret)
+ goto err_out;
+
+ ret = trf7970a_write(trf, TRF7970A_ADJUTABLE_FIFO_IRQ_LEVELS,
+ TRF7970A_ADJUTABLE_FIFO_IRQ_LEVELS_WLH_96 |
+ TRF7970A_ADJUTABLE_FIFO_IRQ_LEVELS_WLL_32);
+ if (ret)
+ goto err_out;
+
+ ret = trf7970a_write(trf, TRF7970A_SPECIAL_FCN_REG1, 0);
+ if (ret)
+ goto err_out;
+
+ trf->special_fcn_reg1 = 0;
+
+ trf->iso_ctrl = 0xff;
+ return 0;
+
+err_out:
+ dev_dbg(trf->dev, "Couldn't init device: %d\n", ret);
+ return ret;
+}
+
static int trf7970a_pm_runtime_resume(struct device *dev)
{
struct spi_device *spi = container_of(dev, struct spi_device, dev);
@@ -1462,7 +1462,7 @@ static int trf7970a_pm_runtime_resume(struct device *dev)
return 0;
}
-#endif
+#endif /* CONFIG_PM_RUNTIME */
static const struct dev_pm_ops trf7970a_pm_ops = {
SET_RUNTIME_PM_OPS(trf7970a_pm_runtime_suspend,
--
1.9.1
next reply other threads:[~2014-06-16 13:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-16 13:06 Geert Uytterhoeven [this message]
2014-06-16 15:58 ` Mark A. Greer
2014-07-03 20:57 ` [linux-nfc] " Mark A. Greer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1402923973-24316-1-git-send-email-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfc@ml01.01.org \
--cc=linux-wireless@vger.kernel.org \
--cc=mgreer@animalcreek.com \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®