summaryrefslogtreecommitdiffstats
path: root/drivers/nfc/nxp-nci
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2015-12-23 23:45:03 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2015-12-29 19:06:14 +0100
commitda5afe06d565ac03c27c6d173f5eaeb473ca1080 (patch)
tree639efe92ce9066ec712a7b8ef139e27b258cbea0 /drivers/nfc/nxp-nci
parentnfc: st21nfca: Remove unneeded CONFIG_OF switches (diff)
downloadlinux-da5afe06d565ac03c27c6d173f5eaeb473ca1080.tar.xz
linux-da5afe06d565ac03c27c6d173f5eaeb473ca1080.zip
nfc: nxp-nci: Remove #ifdef CONFIG_OF
All of_* APIs are safe if CONFIG_OF is not define. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc/nxp-nci')
-rw-r--r--drivers/nfc/nxp-nci/i2c.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c
index ec359fc10b48..c71adc3254df 100644
--- a/drivers/nfc/nxp-nci/i2c.c
+++ b/drivers/nfc/nxp-nci/i2c.c
@@ -264,8 +264,6 @@ exit_irq_none:
return IRQ_NONE;
}
-#ifdef CONFIG_OF
-
static int nxp_nci_i2c_parse_devtree(struct i2c_client *client)
{
struct nxp_nci_i2c_phy *phy = i2c_get_clientdata(client);
@@ -304,15 +302,6 @@ static int nxp_nci_i2c_parse_devtree(struct i2c_client *client)
return 0;
}
-#else
-
-static int nxp_nci_i2c_parse_devtree(struct i2c_client *client)
-{
- return -ENODEV;
-}
-
-#endif
-
static int nxp_nci_i2c_acpi_config(struct nxp_nci_i2c_phy *phy)
{
struct i2c_client *client = phy->i2c_dev;