aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Cuissard <cuissard@marvell.com>2015-11-03 13:19:35 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2015-11-04 18:32:25 -0500
commit6f8c53695d6521c36052d39e29ac1e51ef37eba7 (patch)
tree0d10f7c9c96d9437b2166e33872eb5487fa47363
parentb2fe288eac7247f83b52377b4134ecc5cd856bf2 (diff)
NFC: nfcmrvl: remove unneeded CONFIG_OF switches
Signed-off-by: Vincent Cuissard <cuissard@marvell.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/nfc/nfcmrvl/main.c12
-rw-r--r--drivers/nfc/nfcmrvl/uart.c12
2 files changed, 0 insertions, 24 deletions
diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index 743c74c31cf0..51c8240a1672 100644
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -254,8 +254,6 @@ void nfcmrvl_chip_halt(struct nfcmrvl_private *priv)
254 gpio_set_value(priv->config.reset_n_io, 0); 254 gpio_set_value(priv->config.reset_n_io, 0);
255} 255}
256 256
257#ifdef CONFIG_OF
258
259int nfcmrvl_parse_dt(struct device_node *node, 257int nfcmrvl_parse_dt(struct device_node *node,
260 struct nfcmrvl_platform_data *pdata) 258 struct nfcmrvl_platform_data *pdata)
261{ 259{
@@ -278,16 +276,6 @@ int nfcmrvl_parse_dt(struct device_node *node,
278 276
279 return 0; 277 return 0;
280} 278}
281
282#else
283
284int nfcmrvl_parse_dt(struct device_node *node,
285 struct nfcmrvl_platform_data *pdata)
286{
287 return -ENODEV;
288}
289
290#endif
291EXPORT_SYMBOL_GPL(nfcmrvl_parse_dt); 279EXPORT_SYMBOL_GPL(nfcmrvl_parse_dt);
292 280
293MODULE_AUTHOR("Marvell International Ltd."); 281MODULE_AUTHOR("Marvell International Ltd.");
diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c
index b4c4796dd23e..83a99e38e7bd 100644
--- a/drivers/nfc/nfcmrvl/uart.c
+++ b/drivers/nfc/nfcmrvl/uart.c
@@ -67,8 +67,6 @@ static struct nfcmrvl_if_ops uart_ops = {
67 .nci_update_config = nfcmrvl_uart_nci_update_config 67 .nci_update_config = nfcmrvl_uart_nci_update_config
68}; 68};
69 69
70#ifdef CONFIG_OF
71
72static int nfcmrvl_uart_parse_dt(struct device_node *node, 70static int nfcmrvl_uart_parse_dt(struct device_node *node,
73 struct nfcmrvl_platform_data *pdata) 71 struct nfcmrvl_platform_data *pdata)
74{ 72{
@@ -102,16 +100,6 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node,
102 return 0; 100 return 0;
103} 101}
104 102
105#else
106
107static int nfcmrvl_uart_parse_dt(struct device_node *node,
108 struct nfcmrvl_platform_data *pdata)
109{
110 return -ENODEV;
111}
112
113#endif
114
115/* 103/*
116** NCI UART OPS 104** NCI UART OPS
117*/ 105*/