diff options
author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-12-23 17:45:03 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-12-29 13:06:14 -0500 |
commit | da5afe06d565ac03c27c6d173f5eaeb473ca1080 (patch) | |
tree | 639efe92ce9066ec712a7b8ef139e27b258cbea0 /drivers | |
parent | 9135177fb6cda166c2f4b1f5441a2cefedcbf034 (diff) |
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')
-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: | |||
264 | return IRQ_NONE; | 264 | return IRQ_NONE; |
265 | } | 265 | } |
266 | 266 | ||
267 | #ifdef CONFIG_OF | ||
268 | |||
269 | static int nxp_nci_i2c_parse_devtree(struct i2c_client *client) | 267 | static int nxp_nci_i2c_parse_devtree(struct i2c_client *client) |
270 | { | 268 | { |
271 | struct nxp_nci_i2c_phy *phy = i2c_get_clientdata(client); | 269 | 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) | |||
304 | return 0; | 302 | return 0; |
305 | } | 303 | } |
306 | 304 | ||
307 | #else | ||
308 | |||
309 | static int nxp_nci_i2c_parse_devtree(struct i2c_client *client) | ||
310 | { | ||
311 | return -ENODEV; | ||
312 | } | ||
313 | |||
314 | #endif | ||
315 | |||
316 | static int nxp_nci_i2c_acpi_config(struct nxp_nci_i2c_phy *phy) | 305 | static int nxp_nci_i2c_acpi_config(struct nxp_nci_i2c_phy *phy) |
317 | { | 306 | { |
318 | struct i2c_client *client = phy->i2c_dev; | 307 | struct i2c_client *client = phy->i2c_dev; |