Cc: [email protected]
Signed-off-by: Christophe Ricard <[email protected]>
---
 drivers/nfc/st21nfca/i2c.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c
index a98da33..bb0409e 100644
--- a/drivers/nfc/st21nfca/i2c.c
+++ b/drivers/nfc/st21nfca/i2c.c
@@ -509,7 +509,6 @@ static struct nfc_phy_ops i2c_phy_ops = {
        .disable = st21nfca_hci_i2c_disable,
 };
 
-#ifdef CONFIG_OF
 static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client)
 {
        struct st21nfca_i2c_phy *phy = i2c_get_clientdata(client);
@@ -547,12 +546,6 @@ static int st21nfca_hci_i2c_of_request_resources(struct 
i2c_client *client)
 
        return 0;
 }
-#else
-static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client)
-{
-       return -ENODEV;
-}
-#endif
 
 static int st21nfca_hci_i2c_request_resources(struct i2c_client *client)
 {
@@ -670,14 +663,12 @@ static int st21nfca_hci_i2c_remove(struct i2c_client 
*client)
        return 0;
 }
 
-#ifdef CONFIG_OF
 static const struct of_device_id of_st21nfca_i2c_match[] = {
        { .compatible = "st,st21nfca-i2c", },
        { .compatible = "st,st21nfca_i2c", },
        {}
 };
 MODULE_DEVICE_TABLE(of, of_st21nfca_i2c_match);
-#endif
 
 static struct i2c_driver st21nfca_hci_i2c_driver = {
        .driver = {
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to