From: Christophe Ricard <christophe.ricard@gmail.com>
Date: Wed, 23 Dec 2015 22:45:04 +0000 (+0100)
Subject: nfc: pn544: Remove #ifdef CONFIG_OF
X-Git-Tag: v4.9.8~2476^2~412^2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a21512d1b61c6aeeb05d74910078bc19059da87b;p=platform%2Fkernel%2Flinux-rpi3.git

nfc: pn544: 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>
---

diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c
index fa75c53..534c79f 100644
--- a/drivers/nfc/pn544/i2c.c
+++ b/drivers/nfc/pn544/i2c.c
@@ -938,8 +938,6 @@ static int pn544_hci_i2c_acpi_request_resources(struct i2c_client *client)
 	return 0;
 }
 
-#ifdef CONFIG_OF
-
 static int pn544_hci_i2c_of_request_resources(struct i2c_client *client)
 {
 	struct pn544_i2c_phy *phy = i2c_get_clientdata(client);
@@ -1015,15 +1013,6 @@ err_dt:
 	return ret;
 }
 
-#else
-
-static int pn544_hci_i2c_of_request_resources(struct i2c_client *client)
-{
-	return -ENODEV;
-}
-
-#endif
-
 static int pn544_hci_i2c_probe(struct i2c_client *client,
 			       const struct i2c_device_id *id)
 {