NFC: nfcmrvl: remove unneeded CONFIG_OF switches

Signed-off-by: Vincent Cuissard <cuissard@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index 743c74c31cf0ba69ed4daf2bb2d4d86d6361c083..51c8240a1672a1a329d40b4cb97dbf3582e48f83 100644 (file)
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -254,8 +254,6 @@ void nfcmrvl_chip_halt(struct nfcmrvl_private *priv)
                gpio_set_value(priv->config.reset_n_io, 0);
 }
 
-#ifdef CONFIG_OF
-
 int nfcmrvl_parse_dt(struct device_node *node,
                     struct nfcmrvl_platform_data *pdata)
 {
@@ -278,16 +276,6 @@ int nfcmrvl_parse_dt(struct device_node *node,
 
        return 0;
 }
-
-#else
-
-int nfcmrvl_parse_dt(struct device_node *node,
-                    struct nfcmrvl_platform_data *pdata)
-{
-       return -ENODEV;
-}
-
-#endif
 EXPORT_SYMBOL_GPL(nfcmrvl_parse_dt);
 
 MODULE_AUTHOR("Marvell International Ltd.");

diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c
index b4c4796dd23e26115dcb330421e9311ec99d7ba3..83a99e38e7bd316d949e44d1bc530865ac22befe 100644 (file)
--- a/drivers/nfc/nfcmrvl/uart.c
+++ b/drivers/nfc/nfcmrvl/uart.c
@@ -67,8 +67,6 @@ static struct nfcmrvl_if_ops uart_ops = {
        .nci_update_config = nfcmrvl_uart_nci_update_config
 };
 
-#ifdef CONFIG_OF
-
 static int nfcmrvl_uart_parse_dt(struct device_node *node,
                                 struct nfcmrvl_platform_data *pdata)
 {
@@ -102,16 +100,6 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node,
        return 0;
 }
 
-#else
-
-static int nfcmrvl_uart_parse_dt(struct device_node *node,
-                                struct nfcmrvl_platform_data *pdata)
-{
-       return -ENODEV;
-}
-
-#endif
-
 /*
 ** NCI UART OPS
 */