diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-12-23 23:45:04 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-12-29 19:06:14 +0100 |
| commit | a21512d1b61c6aeeb05d74910078bc19059da87b (patch) | |
| tree | 81e24cd632351d0cb038d367b4f84f974d20b790 /drivers/nfc | |
| parent | da5afe06d565ac03c27c6d173f5eaeb473ca1080 (diff) | |
| download | linux-a21512d1b61c6aeeb05d74910078bc19059da87b.tar.bz2 | |
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) 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) { |