diff options
author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-12-23 17:45:04 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-12-29 13:06:14 -0500 |
commit | a21512d1b61c6aeeb05d74910078bc19059da87b (patch) | |
tree | 81e24cd632351d0cb038d367b4f84f974d20b790 /drivers/nfc | |
parent | da5afe06d565ac03c27c6d173f5eaeb473ca1080 (diff) |
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>
Diffstat (limited to 'drivers/nfc')
-rw-r--r-- | drivers/nfc/pn544/i2c.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c index fa75c53f3fa5..534c79fee1b7 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) | |||
938 | return 0; | 938 | return 0; |
939 | } | 939 | } |
940 | 940 | ||
941 | #ifdef CONFIG_OF | ||
942 | |||
943 | static int pn544_hci_i2c_of_request_resources(struct i2c_client *client) | 941 | static int pn544_hci_i2c_of_request_resources(struct i2c_client *client) |
944 | { | 942 | { |
945 | struct pn544_i2c_phy *phy = i2c_get_clientdata(client); | 943 | struct pn544_i2c_phy *phy = i2c_get_clientdata(client); |
@@ -1015,15 +1013,6 @@ err_dt: | |||
1015 | return ret; | 1013 | return ret; |
1016 | } | 1014 | } |
1017 | 1015 | ||
1018 | #else | ||
1019 | |||
1020 | static int pn544_hci_i2c_of_request_resources(struct i2c_client *client) | ||
1021 | { | ||
1022 | return -ENODEV; | ||
1023 | } | ||
1024 | |||
1025 | #endif | ||
1026 | |||
1027 | static int pn544_hci_i2c_probe(struct i2c_client *client, | 1016 | static int pn544_hci_i2c_probe(struct i2c_client *client, |
1028 | const struct i2c_device_id *id) | 1017 | const struct i2c_device_id *id) |
1029 | { | 1018 | { |