From a21512d1b61c6aeeb05d74910078bc19059da87b Mon Sep 17 00:00:00 2001 From: Christophe Ricard Date: Wed, 23 Dec 2015 23:45:04 +0100 Subject: [PATCH] nfc: pn544: Remove #ifdef CONFIG_OF All of_* APIs are safe if CONFIG_OF is not define. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz --- drivers/nfc/pn544/i2c.c | 11 ----------- 1 file changed, 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) { -- 2.20.1