diff options
author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-12-24 01:45:03 +0300 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-12-29 21:06:14 +0300 |
commit | da5afe06d565ac03c27c6d173f5eaeb473ca1080 (patch) | |
tree | 639efe92ce9066ec712a7b8ef139e27b258cbea0 /drivers/nfc | |
parent | 9135177fb6cda166c2f4b1f5441a2cefedcbf034 (diff) | |
download | linux-da5afe06d565ac03c27c6d173f5eaeb473ca1080.tar.xz |
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')
-rw-r--r-- | drivers/nfc/nxp-nci/i2c.c | 11 |
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; |